Merge 1b151e3ffc into merged_master (Bitcoin PR #18532)

This commit is contained in:
Andrew Poelstra 2020-11-26 01:08:13 +00:00
commit c8909955fa
6 changed files with 12 additions and 12 deletions

View file

@ -6834,6 +6834,8 @@ UniValue removeprunedfunds(const JSONRPCRequest& request);
UniValue importmulti(const JSONRPCRequest& request);
UniValue getwalletpakinfo(const JSONRPCRequest& request);
void RegisterWalletRPCCommands(interfaces::Chain& chain, std::vector<std::unique_ptr<interfaces::Handler>>& handlers)
{
// clang-format off
static const CRPCCommand commands[] =
{ // category name actor (function) argNames
@ -6921,8 +6923,6 @@ static const CRPCCommand commands[] =
};
// clang-format on
void RegisterWalletRPCCommands(interfaces::Chain& chain, std::vector<std::unique_ptr<interfaces::Handler>>& handlers)
{
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
handlers.emplace_back(chain.handleRpc(commands[vcidx]));
}