aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/util.cpp
diff options
context:
space:
mode:
authorRussell Yanofsky <russ@yanofsky.org>2021-01-29 18:15:48 -0500
committerRussell Yanofsky <russ@yanofsky.org>2021-01-29 18:15:48 -0500
commit9048c58e10841d9e1d709c0a325dd14684cec325 (patch)
treeaa399e99d405412a1205c6eec856d5a886b21dc7 /src/rpc/util.cpp
parent14f3d9b908ed9e78997bfaad3d8a06357a89d46e (diff)
downloadbitcoin-9048c58e10841d9e1d709c0a325dd14684cec325.tar.xz
Remove pointer cast in CRPCTable::dumpArgMap
CRPCTable::dumpArgMap currently works by casting RPC command unique_id integer field to a function pointer, and then calling the function. The unique_id field wasn't supposed to be used this way (it's meant to be used to detect RPC aliases), and this code segfaults in the rpc_help.py test in multiprocess PR https://github.com/bitcoin/bitcoin/pull/10102 because wallet RPC functions aren't directly accessible from the node process. Fix this by adding a new GET_ARGS request mode to retrieve argument information similar to the way the GET_HELP mode retrieves help information.
Diffstat (limited to 'src/rpc/util.cpp')
-rw-r--r--src/rpc/util.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/rpc/util.cpp b/src/rpc/util.cpp
index dc57d2be07..c7472fc5c1 100644
--- a/src/rpc/util.cpp
+++ b/src/rpc/util.cpp
@@ -478,6 +478,9 @@ std::string RPCExamples::ToDescriptionString() const
UniValue RPCHelpMan::HandleRequest(const JSONRPCRequest& request)
{
+ if (request.mode == JSONRPCRequest::GET_ARGS) {
+ return GetArgMap();
+ }
/*
* Check if the given request is valid according to this command or if
* the user is asking for help information, and throw help when appropriate.
@@ -561,8 +564,9 @@ std::string RPCHelpMan::ToString() const
return ret;
}
-void RPCHelpMan::AppendArgMap(UniValue& arr) const
+UniValue RPCHelpMan::GetArgMap() const
{
+ UniValue arr{UniValue::VARR};
for (int i{0}; i < int(m_args.size()); ++i) {
const auto& arg = m_args.at(i);
std::vector<std::string> arg_names;
@@ -577,6 +581,7 @@ void RPCHelpMan::AppendArgMap(UniValue& arr) const
arr.push_back(map);
}
}
+ return arr;
}
std::string RPCArg::GetFirstName() const