sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 20:42:59 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #8272: Make the dummy argument to getaddednodeinfo optional

Browse Source 
854f1af Make the dummy argument to getaddednodeinfo optional (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan 2016-09-02 07:39:53 +02:00 committed by Alexander Block
parent bc91f34da6
commit 4d0be42c6e
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/rpc/client.cpp
View File

@ -26,7 +26,6 @@ static const CRPCConvertParam vRPCConvertParams[] =
{ {
{ "stop", 0 }, { "stop", 0 },
{ "setmocktime", 0 }, { "setmocktime", 0 },
{ "getaddednodeinfo", 0 },
{ "generate", 0 }, { "generate", 0 },
{ "generate", 1 }, { "generate", 1 },
{ "generatetoaddress", 0 }, { "generatetoaddress", 0 },

11
src/rpc/net.cpp
View File

@ -256,14 +256,13 @@ UniValue disconnectnode(const UniValue& params, bool fHelp)
UniValue getaddednodeinfo(const UniValue& params, bool fHelp) UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
{ {
if (fHelp || params.size() < 1 || params.size() > 2) if (fHelp || params.size() > 1)
throw runtime_error( throw runtime_error(
"getaddednodeinfo dummy ( \"node\" )\n" "getaddednodeinfo ( \"node\" )\n"
"\nReturns information about the given added node, or all added nodes\n" "\nReturns information about the given added node, or all added nodes\n"
"(note that onetry addnodes are not listed here)\n" "(note that onetry addnodes are not listed here)\n"
"\nArguments:\n" "\nArguments:\n"
"1. dummy (boolean, required) Kept for historical purposes but ignored\n" "1. \"node\" (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n"
"2. \"node\" (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n"
"\nResult:\n" "\nResult:\n"
"[\n" "[\n"
" {\n" " {\n"
@ -289,10 +288,10 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp)
std::vector<AddedNodeInfo> vInfo = g_connman->GetAddedNodeInfo(); std::vector<AddedNodeInfo> vInfo = g_connman->GetAddedNodeInfo();
if (params.size() == 2) { if (params.size() == 1) {
bool found = false; bool found = false;
for (const AddedNodeInfo& info : vInfo) { for (const AddedNodeInfo& info : vInfo) {
if (info.strAddedNode == params[1].get_str()) { if (info.strAddedNode == params[0].get_str()) {
vInfo.assign(1, info); vInfo.assign(1, info);
found = true; found = true;
break; break;