Merge pull request #1350 from jgarzik/del-deprecated

JSON-RPC: remove 'getblocknumber' deprecated RPC
This commit is contained in:
Jeff Garzik 2012-05-18 08:26:40 -07:00
commit d6615a54c6

View file

@ -371,10 +371,7 @@ string CRPCTable::help(string strCommand) const
const CRPCCommand *pcmd = mi->second; const CRPCCommand *pcmd = mi->second;
string strMethod = mi->first; string strMethod = mi->first;
// We already filter duplicates, but these deprecated screw up the sort order // We already filter duplicates, but these deprecated screw up the sort order
if (strMethod == "getamountreceived" || if (strMethod.find("label") != string::npos)
strMethod == "getallreceived" ||
strMethod == "getblocknumber" || // deprecated
(strMethod.find("label") != string::npos))
continue; continue;
if (strCommand != "" && strMethod != strCommand) if (strCommand != "" && strMethod != strCommand)
continue; continue;
@ -439,18 +436,6 @@ Value getblockcount(const Array& params, bool fHelp)
} }
// deprecated
Value getblocknumber(const Array& params, bool fHelp)
{
if (fHelp || params.size() != 0)
throw runtime_error(
"getblocknumber\n"
"Deprecated. Use getblockcount.");
return nBestHeight;
}
Value getconnectioncount(const Array& params, bool fHelp) Value getconnectioncount(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 0) if (fHelp || params.size() != 0)
@ -2257,7 +2242,6 @@ static const CRPCCommand vRPCCommands[] =
{ "help", &help, true }, { "help", &help, true },
{ "stop", &stop, true }, { "stop", &stop, true },
{ "getblockcount", &getblockcount, true }, { "getblockcount", &getblockcount, true },
{ "getblocknumber", &getblocknumber, true },
{ "getconnectioncount", &getconnectioncount, true }, { "getconnectioncount", &getconnectioncount, true },
{ "getdifficulty", &getdifficulty, true }, { "getdifficulty", &getdifficulty, true },
{ "getgenerate", &getgenerate, true }, { "getgenerate", &getgenerate, true },