diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2016-06-26 20:32:37 +0200 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2016-09-01 16:27:30 +0200 |
| commit | 854f1af22e930cbe37195a5e9ad7dd7b878a9106 (patch) | |
| tree | ccd4a36099f3122dd3bdde56ee1699033f396e35 | |
| parent | f061415d12ce86bd440ef039394ba734c59fd97d (diff) | |
| download | bitcoin-854f1af22e930cbe37195a5e9ad7dd7b878a9106.tar.xz | |
Make the dummy argument to getaddednodeinfo optional
| -rw-r--r-- | doc/release-notes.md | 2 | ||||
| -rw-r--r-- | src/rpc/client.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/net.cpp | 11 |
3 files changed, 7 insertions, 7 deletions
diff --git a/doc/release-notes.md b/doc/release-notes.md index f2d8ca3a15..58994a6839 100644 --- a/doc/release-notes.md +++ b/doc/release-notes.md @@ -63,6 +63,8 @@ UTXO set query (`GET /rest/getutxos/<checkmempool>/<txid>-<n>/<txid>-<n>/.../<tx were changed to return status code HTTP_BAD_REQUEST (400) instead of HTTP_INTERNAL_SERVER_ERROR (500) when requests contain invalid parameters. +The first boolean argument to `getaddednodeinfo` has been removed. This is an incompatible change. + ### Configuration and command-line options ### Block and transaction handling diff --git a/src/rpc/client.cpp b/src/rpc/client.cpp index d0675fdb49..3003ea3452 100644 --- a/src/rpc/client.cpp +++ b/src/rpc/client.cpp @@ -26,7 +26,6 @@ static const CRPCConvertParam vRPCConvertParams[] = { { "stop", 0 }, { "setmocktime", 0 }, - { "getaddednodeinfo", 0 }, { "generate", 0 }, { "generate", 1 }, { "generatetoaddress", 0 }, diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index 88da77cb42..840bfd5a24 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -269,14 +269,13 @@ UniValue disconnectnode(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( - "getaddednodeinfo dummy ( \"node\" )\n" + "getaddednodeinfo ( \"node\" )\n" "\nReturns information about the given added node, or all added nodes\n" "(note that onetry addnodes are not listed here)\n" "\nArguments:\n" - "1. dummy (boolean, required) Kept for historical purposes but ignored\n" - "2. \"node\" (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n" + "1. \"node\" (string, optional) If provided, return information about this specific node, otherwise all nodes are returned.\n" "\nResult:\n" "[\n" " {\n" @@ -299,10 +298,10 @@ UniValue getaddednodeinfo(const UniValue& params, bool fHelp) std::vector<AddedNodeInfo> vInfo = GetAddedNodeInfo(); - if (params.size() == 2) { + if (params.size() == 1) { bool found = false; for (const AddedNodeInfo& info : vInfo) { - if (info.strAddedNode == params[1].get_str()) { + if (info.strAddedNode == params[0].get_str()) { vInfo.assign(1, info); found = true; break; |