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

@ -2610,6 +2610,8 @@ UniValue dumptxoutset(const JSONRPCRequest& request)
return result;
}
void RegisterBlockchainRPCCommands(CRPCTable &t)
{
// clang-format off
static const CRPCCommand commands[] =
@ -2654,8 +2656,6 @@ static const CRPCCommand commands[] =
};
// clang-format on
void RegisterBlockchainRPCCommands(CRPCTable &t)
{
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
t.appendCommand(commands[vcidx].name, &commands[vcidx]);
}

View file

@ -1525,6 +1525,8 @@ UniValue testproposedblock(const JSONRPCRequest& request)
// END ELEMENTS
//
void RegisterMiningRPCCommands(CRPCTable &t)
{
// clang-format off
static const CRPCCommand commands[] =
@ -1555,8 +1557,6 @@ static const CRPCCommand commands[] =
};
// clang-format on
void RegisterMiningRPCCommands(CRPCTable &t)
{
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
t.appendCommand(commands[vcidx].name, &commands[vcidx]);
}

View file

@ -841,6 +841,8 @@ UniValue createblindedaddress(const JSONRPCRequest& request)
// END ELEMENTS CALLS
//
void RegisterMiscRPCCommands(CRPCTable &t)
{
// clang-format off
static const CRPCCommand commands[] =
@ -869,8 +871,6 @@ static const CRPCCommand commands[] =
};
// clang-format on
void RegisterMiscRPCCommands(CRPCTable &t)
{
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
t.appendCommand(commands[vcidx].name, &commands[vcidx]);
}

View file

@ -760,6 +760,8 @@ static UniValue getnodeaddresses(const JSONRPCRequest& request)
return ret;
}
void RegisterNetRPCCommands(CRPCTable &t)
{
// clang-format off
static const CRPCCommand commands[] =
{ // category name actor (function) argNames
@ -780,8 +782,6 @@ static const CRPCCommand commands[] =
};
// clang-format on
void RegisterNetRPCCommands(CRPCTable &t)
{
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
t.appendCommand(commands[vcidx].name, &commands[vcidx]);
}

View file

@ -2655,6 +2655,8 @@ UniValue rawreissueasset(const JSONRPCRequest& request)
// END ELEMENTS
//
void RegisterRawTransactionRPCCommands(CRPCTable &t)
{
// clang-format off
static const CRPCCommand commands[] =
{ // category name actor (function) argNames
@ -2685,8 +2687,6 @@ static const CRPCCommand commands[] =
};
// clang-format on
void RegisterRawTransactionRPCCommands(CRPCTable &t)
{
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
t.appendCommand(commands[vcidx].name, &commands[vcidx]);
}

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]));
}