Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-02 23:42:33 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Add RPC server ExecuteCommands function

Browse Source 
No change in behavior. New function is split from CRPCTable::execute and
used in the next commit.
This commit is contained in:
Russell Yanofsky 2021-01-29 18:12:19 -05:00
parent 6158a6d397
commit 14f3d9b908
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/rpc/server.cpp
View File

@ -437,6 +437,16 @@ static inline JSONRPCRequest transformNamedArguments(const JSONRPCRequest& in, c
return out; return out;
} }
static bool ExecuteCommands(const std::vector<const CRPCCommand*>& commands, const JSONRPCRequest& request, UniValue& result)
{
for (const auto& command : commands) {
if (ExecuteCommand(*command, request, result, &command == &commands.back())) {
return true;
}
}
return false;
}
UniValue CRPCTable::execute(const JSONRPCRequest &request) const UniValue CRPCTable::execute(const JSONRPCRequest &request) const
{ {
// Return immediately if in warmup // Return immediately if in warmup
@ -450,10 +460,8 @@ UniValue CRPCTable::execute(const JSONRPCRequest &request) const
auto it = mapCommands.find(request.strMethod); auto it = mapCommands.find(request.strMethod);
if (it != mapCommands.end()) { if (it != mapCommands.end()) {
UniValue result; UniValue result;
for (const auto& command : it->second) { if (ExecuteCommands(it->second, request, result)) {
if (ExecuteCommand(*command, request, result, &command == &it->second.back())) { return result;
return result;
}
} }
} }
throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Method not found"); throw JSONRPCError(RPC_METHOD_NOT_FOUND, "Method not found");