Deprecate RPC getblocknumber

This RPC is exactly identical to getblockcount.  This duplication
dates back to commit 22f721dbf2 when
Satoshi created the RPC interface.

There's no need to have both, so we standardize on "count" which
matches the naming convention in getconnectioncount.

Following the tradition established with previously deprecated APIs,
getblocknumber continues to work, but it's not listed in the help
system.
This commit is contained in:
Michael Hendricks 2011-11-10 17:10:32 -07:00
parent 5efee7da86
commit 29c8b9416d

View File

@ -126,6 +126,7 @@ Value help(const Array& params, bool fHelp)
// 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 == "getamountreceived" ||
strMethod == "getallreceived" || strMethod == "getallreceived" ||
strMethod == "getblocknumber" || // deprecated
(strMethod.find("label") != string::npos)) (strMethod.find("label") != string::npos))
continue; continue;
if (strCommand != "" && strMethod != strCommand) if (strCommand != "" && strMethod != strCommand)
@ -178,12 +179,13 @@ Value getblockcount(const Array& params, bool fHelp)
} }
// deprecated
Value getblocknumber(const Array& params, bool fHelp) Value getblocknumber(const Array& params, bool fHelp)
{ {
if (fHelp || params.size() != 0) if (fHelp || params.size() != 0)
throw runtime_error( throw runtime_error(
"getblocknumber\n" "getblocknumber\n"
"Returns the block number of the latest block in the longest block chain."); "Deprecated. Use getblockcount.");
return nBestHeight; return nBestHeight;
} }
@ -1858,7 +1860,7 @@ string pAllowInSafeMode[] =
"help", "help",
"stop", "stop",
"getblockcount", "getblockcount",
"getblocknumber", "getblocknumber", // deprecated
"getconnectioncount", "getconnectioncount",
"getdifficulty", "getdifficulty",
"getgenerate", "getgenerate",