From ce7d354f2bf9ff50adee845162a4fc5291a03c6b Mon Sep 17 00:00:00 2001 From: laanwj <126646+laanwj@users.noreply.github.com> Date: Tue, 26 Apr 2022 15:10:22 +0200 Subject: [PATCH 01/10] Merge bitcoin/bitcoin#24959: Remove not needed clang-format off comments fa870e3d4ccd6dfd0a9a8f2c608721a7251114e2 Remove not needed clang-format off comments (MarcoFalke) Pull request description: It seems odd to disable clang-format and force manual formatting when there is no need for it. So remove the clang-format comments and other unneeded comments. Can be reviewed with `--word-diff-regex=. --ignore-all-space` Looks like this was initially added in commit d9d79576f423cd9c5cef4547c7e3648dbb339460 to accommodate a linter that has since been removed and replaced by a functional test. ACKs for top commit: laanwj: Code review ACK fa870e3d4ccd6dfd0a9a8f2c608721a7251114e2 fanquake: ACK fa870e3d4ccd6dfd0a9a8f2c608721a7251114e2 Tree-SHA512: 0f8f97c12f5dbe517dd96c10b10ce1b8772d8daed33e6b41f73ea1040e89888cf3b8c0ad7b20319e366fe30c71e8b181c89098ae7f6a3deb8647e1b4731db815 --- src/rpc/blockchain.cpp | 76 +++++++++---------- src/rpc/coinjoin.cpp | 38 ++++------ src/rpc/evo.cpp | 71 ++++++++---------- src/rpc/governance.cpp | 49 +++++-------- src/rpc/masternode.cpp | 34 ++++----- src/rpc/mempool.cpp | 2 - src/rpc/mining.cpp | 30 +++----- src/rpc/net.cpp | 45 +++++------- src/rpc/quorums.cpp | 48 ++++++------ src/rpc/rawtransaction.cpp | 46 ++++++------ src/rpc/server.cpp | 15 ++-- src/rpc/txoutproof.cpp | 2 - src/wallet/rpc/wallet.cpp | 146 ++++++++++++++++++------------------- src/zmq/zmqrpc.cpp | 6 +- 14 files changed, 267 insertions(+), 341 deletions(-) diff --git a/src/rpc/blockchain.cpp b/src/rpc/blockchain.cpp index 35e4d54c1f25..92c0f1fa31ed 100644 --- a/src/rpc/blockchain.cpp +++ b/src/rpc/blockchain.cpp @@ -2759,48 +2759,40 @@ UniValue CreateUTXOSnapshot( return result; } - -void RegisterBlockchainRPCCommands(CRPCTable &t) -{ -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ------------------------ - { "blockchain", &getblockchaininfo, }, - { "blockchain", &getchaintxstats, }, - { "blockchain", &getblockstats, }, - { "blockchain", &getbestblockhash, }, - { "blockchain", &getbestchainlock, }, - { "blockchain", &getblockcount, }, - { "blockchain", &getblock, }, - { "blockchain", &getblockfrompeer, }, - { "blockchain", &getblockhashes, }, - { "blockchain", &getblockhash, }, - { "blockchain", &getblockheader, }, - { "blockchain", &getblockheaders, }, - { "blockchain", &getmerkleblocks, }, - { "blockchain", &getchaintips, }, - { "blockchain", &getdifficulty, }, - { "blockchain", &getspecialtxes, }, - { "blockchain", &gettxout, }, - { "blockchain", &gettxoutsetinfo, }, - { "blockchain", &pruneblockchain, }, - { "blockchain", &verifychain, }, - - { "blockchain", &preciousblock, }, - { "blockchain", &scantxoutset, }, - { "blockchain", &getblockfilter, }, - - /* Not shown in help */ - { "hidden", &invalidateblock, }, - { "hidden", &reconsiderblock, }, - { "hidden", &waitfornewblock, }, - { "hidden", &waitforblock, }, - { "hidden", &waitforblockheight, }, - { "hidden", &syncwithvalidationinterfacequeue, }, - { "hidden", &dumptxoutset, }, -}; -// clang-format on +void RegisterBlockchainRPCCommands(CRPCTable& t) +{ + static const CRPCCommand commands[]{ + {"blockchain", &getblockchaininfo}, + {"blockchain", &getchaintxstats}, + {"blockchain", &getblockstats}, + {"blockchain", &getbestblockhash}, + {"blockchain", &getbestchainlock}, + {"blockchain", &getblockcount}, + {"blockchain", &getblock}, + {"blockchain", &getblockfrompeer}, + {"blockchain", &getblockhashes}, + {"blockchain", &getblockhash}, + {"blockchain", &getblockheader}, + {"blockchain", &getblockheaders}, + {"blockchain", &getmerkleblocks}, + {"blockchain", &getchaintips}, + {"blockchain", &getdifficulty}, + {"blockchain", &getspecialtxes}, + {"blockchain", &gettxout}, + {"blockchain", &gettxoutsetinfo}, + {"blockchain", &pruneblockchain}, + {"blockchain", &verifychain}, + {"blockchain", &preciousblock}, + {"blockchain", &scantxoutset}, + {"blockchain", &getblockfilter}, + {"hidden", &invalidateblock}, + {"hidden", &reconsiderblock}, + {"hidden", &waitfornewblock}, + {"hidden", &waitforblock}, + {"hidden", &waitforblockheight}, + {"hidden", &syncwithvalidationinterfacequeue}, + {"hidden", &dumptxoutset}, + }; for (const auto& c : commands) { t.appendCommand(c.name, &c); } diff --git a/src/rpc/coinjoin.cpp b/src/rpc/coinjoin.cpp index e0367734467a..ef578d726101 100644 --- a/src/rpc/coinjoin.cpp +++ b/src/rpc/coinjoin.cpp @@ -503,35 +503,27 @@ static RPCHelpMan getcoinjoininfo() #ifdef ENABLE_WALLET Span GetWalletCoinJoinRPCCommands() { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "dash", &coinjoin, }, - { "dash", &coinjoin_reset, }, - { "dash", &coinjoin_start, }, - { "dash", &coinjoin_status, }, - { "dash", &coinjoin_stop, }, - { "dash", &coinjoinsalt, }, - { "dash", &coinjoinsalt_generate, }, - { "dash", &coinjoinsalt_get, }, - { "dash", &coinjoinsalt_set, }, - { "dash", &getcoinjoininfo, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"dash", &coinjoin}, + {"dash", &coinjoin_reset}, + {"dash", &coinjoin_start}, + {"dash", &coinjoin_status}, + {"dash", &coinjoin_stop}, + {"dash", &coinjoinsalt}, + {"dash", &coinjoinsalt_generate}, + {"dash", &coinjoinsalt_get}, + {"dash", &coinjoinsalt_set}, + {"dash", &getcoinjoininfo}, + }; return commands; } #endif // ENABLE_WALLET void RegisterCoinJoinRPCCommands(CRPCTable& t) { -// clang-format off -static const CRPCCommand commands_wallet[] = -{ // category actor (function) - // --------------------- ----------------------- - { "dash", &getcoinjoininfo, }, -}; -// clang-format on + static const CRPCCommand commands_wallet[]{ + {"dash", &getcoinjoininfo}, + }; // If we aren't compiling with wallet support, we still need to register RPCs that are // capable of working without wallet support. We have to do this even if wallet support // is compiled in but is disabled at runtime because runtime disablement prohibits diff --git a/src/rpc/evo.cpp b/src/rpc/evo.cpp index 3e0dcc641636..81bf1ecd7814 100644 --- a/src/rpc/evo.cpp +++ b/src/rpc/evo.cpp @@ -1845,52 +1845,43 @@ static RPCHelpMan bls_help() #ifdef ENABLE_WALLET Span GetWalletEvoRPCCommands() { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "evo", &protx_list, }, - { "evo", &protx_info, }, - { "evo", &protx_register, }, - { "evo", &protx_register_evo, }, - { "evo", &protx_register_fund, }, - { "evo", &protx_register_fund_evo, }, - { "evo", &protx_register_prepare, }, - { "evo", &protx_register_prepare_evo, }, - { "evo", &protx_update_service, }, - { "evo", &protx_update_service_evo, }, - { "evo", &protx_register_submit, }, - { "evo", &protx_update_registrar, }, - { "evo", &protx_revoke, }, - { "hidden", &protx_register_legacy, }, - { "hidden", &protx_register_fund_legacy, }, - { "hidden", &protx_register_prepare_legacy, }, - { "hidden", &protx_update_registrar_legacy, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"evo", &protx_list}, + {"evo", &protx_info}, + {"evo", &protx_register}, + {"evo", &protx_register_evo}, + {"evo", &protx_register_fund}, + {"evo", &protx_register_fund_evo}, + {"evo", &protx_register_prepare}, + {"evo", &protx_register_prepare_evo}, + {"evo", &protx_update_service}, + {"evo", &protx_update_service_evo}, + {"evo", &protx_register_submit}, + {"evo", &protx_update_registrar}, + {"evo", &protx_revoke}, + {"hidden", &protx_register_legacy}, + {"hidden", &protx_register_fund_legacy}, + {"hidden", &protx_register_prepare_legacy}, + {"hidden", &protx_update_registrar_legacy}, + }; return commands; } #endif // ENABLE_WALLET void RegisterEvoRPCCommands(CRPCTable& tableRPC) { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "evo", &bls_help, }, - { "evo", &bls_generate, }, - { "evo", &bls_fromsecret, }, - { "evo", &protx_help, }, - { "evo", &protx_diff, }, - { "evo", &protx_listdiff, }, -}; -static const CRPCCommand commands_wallet[] = -{ - { "evo", &protx_list, }, - { "evo", &protx_info, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"evo", &bls_help}, + {"evo", &bls_generate}, + {"evo", &bls_fromsecret}, + {"evo", &protx_help}, + {"evo", &protx_diff}, + {"evo", &protx_listdiff}, + }; + static const CRPCCommand commands_wallet[]{ + {"evo", &protx_list}, + {"evo", &protx_info}, + }; for (const auto& command : commands) { tableRPC.appendCommand(command.name, &command); } diff --git a/src/rpc/governance.cpp b/src/rpc/governance.cpp index ea66057b457c..abbffc93804a 100644 --- a/src/rpc/governance.cpp +++ b/src/rpc/governance.cpp @@ -1052,41 +1052,32 @@ static RPCHelpMan getsuperblockbudget() #ifdef ENABLE_WALLET Span GetWalletGovernanceRPCCommands() { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "dash", &gobject_prepare, }, - { "dash", &gobject_list_prepared, }, - { "dash", &gobject_vote_many, }, - { "dash", &gobject_vote_alias, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"dash", &gobject_prepare}, + {"dash", &gobject_list_prepared}, + {"dash", &gobject_vote_many}, + {"dash", &gobject_vote_alias}, + }; return commands; } #endif // ENABLE_WALLET void RegisterGovernanceRPCCommands(CRPCTable &t) { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - /* Dash features */ - { "dash", &getgovernanceinfo, }, - { "dash", &getsuperblockbudget, }, - { "dash", &gobject, }, - { "dash", &gobject_count, }, - { "dash", &gobject_deserialize, }, - { "dash", &gobject_check, }, - { "dash", &gobject_submit, }, - { "dash", &gobject_list, }, - { "dash", &gobject_diff, }, - { "dash", &gobject_get, }, - { "dash", &gobject_getcurrentvotes, }, - { "dash", &voteraw, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"dash", &getgovernanceinfo}, + {"dash", &getsuperblockbudget}, + {"dash", &gobject}, + {"dash", &gobject_count}, + {"dash", &gobject_deserialize}, + {"dash", &gobject_check}, + {"dash", &gobject_submit}, + {"dash", &gobject_list}, + {"dash", &gobject_diff}, + {"dash", &gobject_get}, + {"dash", &gobject_getcurrentvotes}, + {"dash", &voteraw}, + }; for (const auto& command : commands) { t.appendCommand(command.name, &command); } diff --git a/src/rpc/masternode.cpp b/src/rpc/masternode.cpp index 727b20e9ebf5..d3fc88b11f97 100644 --- a/src/rpc/masternode.cpp +++ b/src/rpc/masternode.cpp @@ -679,33 +679,25 @@ static RPCHelpMan masternodelist_composite() #ifdef ENABLE_WALLET Span GetWalletMasternodeRPCCommands() { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "dash", &masternode_outputs, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"dash", &masternode_outputs}, + }; return commands; } #endif // ENABLE_WALLET void RegisterMasternodeRPCCommands(CRPCTable &t) { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "dash", &masternode_help, }, - { "dash", &masternodelist_composite, }, - { "dash", &masternodelist, }, - { "dash", &masternode_connect, }, - { "dash", &masternode_count, }, - { "dash", &masternode_status, }, - { "dash", &masternode_payments, }, - { "dash", &masternode_winners, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"dash", &masternode_help}, + {"dash", &masternodelist_composite}, + {"dash", &masternodelist}, + {"dash", &masternode_connect}, + {"dash", &masternode_count}, + {"dash", &masternode_status}, + {"dash", &masternode_payments}, + {"dash", &masternode_winners}, + }; for (const auto& command : commands) { t.appendCommand(command.name, &command); } diff --git a/src/rpc/mempool.cpp b/src/rpc/mempool.cpp index 165ea861df88..929ac1037099 100644 --- a/src/rpc/mempool.cpp +++ b/src/rpc/mempool.cpp @@ -683,8 +683,6 @@ static RPCHelpMan savemempool() void RegisterMempoolRPCCommands(CRPCTable& t) { static const CRPCCommand commands[]{ - // category actor (function) - // -------- ---------------- {"rawtransactions", &sendrawtransaction}, {"rawtransactions", &testmempoolaccept}, {"blockchain", &getmempoolancestors}, diff --git a/src/rpc/mining.cpp b/src/rpc/mining.cpp index d055d17d7bfd..8755ae72b33f 100644 --- a/src/rpc/mining.cpp +++ b/src/rpc/mining.cpp @@ -1094,24 +1094,18 @@ static RPCHelpMan submitheader() void RegisterMiningRPCCommands(CRPCTable& t) { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "mining", &getnetworkhashps, }, - { "mining", &getmininginfo, }, - { "mining", &prioritisetransaction, }, - { "mining", &getblocktemplate, }, - { "mining", &submitblock, }, - { "mining", &submitheader, }, - - { "hidden", &generatetoaddress, }, - { "hidden", &generatetodescriptor, }, - { "hidden", &generateblock, }, - - { "hidden", &generate, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"mining", &getnetworkhashps}, + {"mining", &getmininginfo}, + {"mining", &prioritisetransaction}, + {"mining", &getblocktemplate}, + {"mining", &submitblock}, + {"mining", &submitheader}, + {"hidden", &generatetoaddress}, + {"hidden", &generatetodescriptor}, + {"hidden", &generateblock}, + {"hidden", &generate}, + }; for (const auto& c : commands) { t.appendCommand(c.name, &c); } diff --git a/src/rpc/net.cpp b/src/rpc/net.cpp index e77eeba6cb8d..fbd72f6c349d 100644 --- a/src/rpc/net.cpp +++ b/src/rpc/net.cpp @@ -1112,31 +1112,26 @@ static RPCHelpMan setmnthreadactive() void RegisterNetRPCCommands(CRPCTable &t) { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor - // --------------------- ----------------------- - { "network", &getconnectioncount, }, - { "network", &ping, }, - { "network", &getpeerinfo, }, - { "network", &addnode, }, - { "network", &disconnectnode, }, - { "network", &getaddednodeinfo, }, - { "network", &getnettotals, }, - { "network", &getnetworkinfo, }, - { "network", &setban, }, - { "network", &listbanned, }, - { "network", &clearbanned, }, - { "network", &setnetworkactive, }, - { "network", &getnodeaddresses, }, - - { "hidden", &cleardiscouraged, }, - { "hidden", &addconnection, }, - { "hidden", &addpeeraddress, }, - { "hidden", &sendmsgtopeer }, - { "hidden", &setmnthreadactive }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"network", &getconnectioncount}, + {"network", &ping}, + {"network", &getpeerinfo}, + {"network", &addnode}, + {"network", &disconnectnode}, + {"network", &getaddednodeinfo}, + {"network", &getnettotals}, + {"network", &getnetworkinfo}, + {"network", &setban}, + {"network", &listbanned}, + {"network", &clearbanned}, + {"network", &setnetworkactive}, + {"network", &getnodeaddresses}, + {"hidden", &cleardiscouraged}, + {"hidden", &addconnection}, + {"hidden", &addpeeraddress}, + {"hidden", &sendmsgtopeer}, + {"hidden", &setmnthreadactive}, + }; for (const auto& c : commands) { t.appendCommand(c.name, &c); } diff --git a/src/rpc/quorums.cpp b/src/rpc/quorums.cpp index a9b3b88d3455..b12b738f9046 100644 --- a/src/rpc/quorums.cpp +++ b/src/rpc/quorums.cpp @@ -1155,32 +1155,28 @@ static RPCHelpMan submitchainlock() void RegisterQuorumsRPCCommands(CRPCTable &tableRPC) { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "evo", &quorum_help, }, - { "evo", &quorum_list, }, - { "evo", &quorum_list_extended, }, - { "evo", &quorum_info, }, - { "evo", &quorum_dkginfo, }, - { "evo", &quorum_dkgstatus, }, - { "evo", &quorum_memberof, }, - { "evo", &quorum_sign, }, - { "evo", &quorum_platformsign, }, - { "evo", &quorum_verify, }, - { "evo", &quorum_hasrecsig, }, - { "evo", &quorum_getrecsig, }, - { "evo", &quorum_isconflicting, }, - { "evo", &quorum_selectquorum, }, - { "evo", &quorum_dkgsimerror, }, - { "evo", &quorum_getdata, }, - { "evo", &quorum_rotationinfo, }, - { "evo", &submitchainlock, }, - { "evo", &verifychainlock, }, - { "evo", &verifyislock, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"evo", &quorum_help}, + {"evo", &quorum_list}, + {"evo", &quorum_list_extended}, + {"evo", &quorum_info}, + {"evo", &quorum_dkginfo}, + {"evo", &quorum_dkgstatus}, + {"evo", &quorum_memberof}, + {"evo", &quorum_sign}, + {"evo", &quorum_platformsign}, + {"evo", &quorum_verify}, + {"evo", &quorum_hasrecsig}, + {"evo", &quorum_getrecsig}, + {"evo", &quorum_isconflicting}, + {"evo", &quorum_selectquorum}, + {"evo", &quorum_dkgsimerror}, + {"evo", &quorum_getdata}, + {"evo", &quorum_rotationinfo}, + {"evo", &submitchainlock}, + {"evo", &verifychainlock}, + {"evo", &verifyislock}, + }; for (const auto& command : commands) { tableRPC.appendCommand(command.name, &command); } diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index 77de92f39f67..379e56a39e50 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -1909,32 +1909,28 @@ static RPCHelpMan analyzepsbt() }; } -void RegisterRawTransactionRPCCommands(CRPCTable &t) +void RegisterRawTransactionRPCCommands(CRPCTable& t) { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // --------------------- ----------------------- - { "rawtransactions", &getassetunlockstatuses, }, - { "rawtransactions", &getrawtransaction, }, - { "rawtransactions", &getrawtransactionmulti, }, - { "rawtransactions", &getislocks, }, - { "rawtransactions", &gettxchainlocks, }, - { "rawtransactions", &createrawtransaction, }, - { "rawtransactions", &decoderawtransaction, }, - { "rawtransactions", &decodescript, }, - { "rawtransactions", &combinerawtransaction, }, - { "rawtransactions", &signrawtransactionwithkey, }, - { "rawtransactions", &decodepsbt, }, - { "rawtransactions", &combinepsbt, }, - { "rawtransactions", &finalizepsbt, }, - { "rawtransactions", &createpsbt, }, - { "rawtransactions", &converttopsbt, }, - { "rawtransactions", &utxoupdatepsbt, }, - { "rawtransactions", &joinpsbts, }, - { "rawtransactions", &analyzepsbt, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"rawtransactions", &getassetunlockstatuses}, + {"rawtransactions", &getrawtransaction}, + {"rawtransactions", &getrawtransactionmulti}, + {"rawtransactions", &getislocks}, + {"rawtransactions", &gettxchainlocks}, + {"rawtransactions", &createrawtransaction}, + {"rawtransactions", &decoderawtransaction}, + {"rawtransactions", &decodescript}, + {"rawtransactions", &combinerawtransaction}, + {"rawtransactions", &signrawtransactionwithkey}, + {"rawtransactions", &decodepsbt}, + {"rawtransactions", &combinepsbt}, + {"rawtransactions", &finalizepsbt}, + {"rawtransactions", &createpsbt}, + {"rawtransactions", &converttopsbt}, + {"rawtransactions", &utxoupdatepsbt}, + {"rawtransactions", &joinpsbts}, + {"rawtransactions", &analyzepsbt}, + }; for (const auto& c : commands) { t.appendCommand(c.name, &c); } diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 80e07ad9b1d5..55c79374acea 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -266,17 +266,14 @@ static RPCHelpMan getrpcinfo() } }; } -// clang-format off -static const CRPCCommand vRPCCommands[] = -{ // category actor (function) - // --------------------- ----------------------- + +static const CRPCCommand vRPCCommands[]{ /* Overall control/query calls */ - { "control", &getrpcinfo, }, - { "control", &help, }, - { "control", &stop, }, - { "control", &uptime, }, + {"control", &getrpcinfo}, + {"control", &help}, + {"control", &stop}, + {"control", &uptime}, }; -// clang-format on CRPCTable::CRPCTable() { diff --git a/src/rpc/txoutproof.cpp b/src/rpc/txoutproof.cpp index 45de1e39d2c0..168a47cb1a87 100644 --- a/src/rpc/txoutproof.cpp +++ b/src/rpc/txoutproof.cpp @@ -177,8 +177,6 @@ static RPCHelpMan verifytxoutproof() void RegisterTxoutProofRPCCommands(CRPCTable& t) { static const CRPCCommand commands[]{ - // category actor (function) - // -------- ---------------- {"blockchain", &gettxoutproof}, {"blockchain", &verifytxoutproof}, }; diff --git a/src/wallet/rpc/wallet.cpp b/src/wallet/rpc/wallet.cpp index d7fdae8cd609..b55a93fe5185 100644 --- a/src/wallet/rpc/wallet.cpp +++ b/src/wallet/rpc/wallet.cpp @@ -1153,81 +1153,77 @@ RPCHelpMan abortrescan(); Span GetWalletRPCCommands() { -// clang-format off -static const CRPCCommand commands[] = -{ // category actor (function) - // ------------------ ------------------------ - { "rawtransactions", &fundrawtransaction, }, - { "wallet", &abandontransaction, }, - { "wallet", &abortrescan, }, - { "wallet", &addmultisigaddress, }, - { "wallet", &backupwallet, }, - { "wallet", &createwallet, }, - { "wallet", &restorewallet, }, - { "wallet", &dumphdinfo, }, - { "wallet", &dumpprivkey, }, - { "wallet", &dumpwallet, }, - { "wallet", &encryptwallet, }, - { "wallet", &getaddressesbylabel, }, - { "wallet", &getaddressinfo, }, - { "wallet", &getbalance, }, - { "wallet", &getnewaddress, }, - { "wallet", &getrawchangeaddress, }, - { "wallet", &getreceivedbyaddress, }, - { "wallet", &getreceivedbylabel, }, - { "wallet", &gettransaction, }, - { "wallet", &getunconfirmedbalance, }, - { "wallet", &getbalances, }, - { "wallet", &getwalletinfo, }, - { "wallet", &importaddress, }, - { "wallet", &importelectrumwallet, }, - { "wallet", &importdescriptors, }, - { "wallet", &importmulti, }, - { "wallet", &importprivkey, }, - { "wallet", &importprunedfunds, }, - { "wallet", &importpubkey, }, - { "wallet", &importwallet, }, - { "wallet", &keypoolrefill, }, - { "wallet", &listaddressbalances, }, - { "wallet", &listaddressgroupings, }, - { "wallet", &listdescriptors, }, - { "wallet", &listlabels, }, - { "wallet", &listlockunspent, }, - { "wallet", &listreceivedbyaddress, }, - { "wallet", &listreceivedbylabel, }, - { "wallet", &listsinceblock, }, - { "wallet", &listtransactions, }, - { "wallet", &listunspent, }, - { "wallet", &listwalletdir, }, - { "wallet", &listwallets, }, - { "wallet", &loadwallet, }, - { "wallet", &lockunspent, }, - { "wallet", &newkeypool, }, - { "wallet", &removeprunedfunds, }, - { "wallet", &rescanblockchain, }, - { "wallet", &send, }, - { "wallet", &sendmany, }, - { "wallet", &sendtoaddress, }, - { "wallet", &sethdseed, }, - { "wallet", &setcoinjoinrounds, }, - { "wallet", &setcoinjoinamount, }, - { "wallet", &setlabel, }, - { "wallet", &settxfee, }, - { "wallet", &setwalletflag, }, - { "wallet", &signmessage, }, - { "wallet", &signrawtransactionwithwallet, }, - { "wallet", &simulaterawtransaction, }, - { "wallet", &unloadwallet, }, - { "wallet", &upgradewallet, }, - { "wallet", &upgradetohd, }, - { "wallet", &walletlock, }, - { "wallet", &walletpassphrasechange, }, - { "wallet", &walletpassphrase, }, - { "wallet", &walletprocesspsbt, }, - { "wallet", &walletcreatefundedpsbt, }, - { "wallet", &wipewallettxes, }, -}; -// clang-format on + static const CRPCCommand commands[]{ + {"rawtransactions", &fundrawtransaction}, + {"wallet", &abandontransaction}, + {"wallet", &abortrescan}, + {"wallet", &addmultisigaddress}, + {"wallet", &backupwallet}, + {"wallet", &createwallet}, + {"wallet", &restorewallet}, + {"wallet", &dumphdinfo}, + {"wallet", &dumpprivkey}, + {"wallet", &dumpwallet}, + {"wallet", &encryptwallet}, + {"wallet", &getaddressesbylabel}, + {"wallet", &getaddressinfo}, + {"wallet", &getbalance}, + {"wallet", &getnewaddress}, + {"wallet", &getrawchangeaddress}, + {"wallet", &getreceivedbyaddress}, + {"wallet", &getreceivedbylabel}, + {"wallet", &gettransaction}, + {"wallet", &getunconfirmedbalance}, + {"wallet", &getbalances}, + {"wallet", &getwalletinfo}, + {"wallet", &importaddress}, + {"wallet", &importelectrumwallet}, + {"wallet", &importdescriptors}, + {"wallet", &importmulti}, + {"wallet", &importprivkey}, + {"wallet", &importprunedfunds}, + {"wallet", &importpubkey}, + {"wallet", &importwallet}, + {"wallet", &keypoolrefill}, + {"wallet", &listaddressbalances}, + {"wallet", &listaddressgroupings}, + {"wallet", &listdescriptors}, + {"wallet", &listlabels}, + {"wallet", &listlockunspent}, + {"wallet", &listreceivedbyaddress}, + {"wallet", &listreceivedbylabel}, + {"wallet", &listsinceblock}, + {"wallet", &listtransactions}, + {"wallet", &listunspent}, + {"wallet", &listwalletdir}, + {"wallet", &listwallets}, + {"wallet", &loadwallet}, + {"wallet", &lockunspent}, + {"wallet", &newkeypool}, + {"wallet", &removeprunedfunds}, + {"wallet", &rescanblockchain}, + {"wallet", &send}, + {"wallet", &sendmany}, + {"wallet", &sendtoaddress}, + {"wallet", &sethdseed}, + {"wallet", &setcoinjoinrounds}, + {"wallet", &setcoinjoinamount}, + {"wallet", &setlabel}, + {"wallet", &settxfee}, + {"wallet", &setwalletflag}, + {"wallet", &signmessage}, + {"wallet", &signrawtransactionwithwallet}, + {"wallet", &simulaterawtransaction}, + {"wallet", &unloadwallet}, + {"wallet", &upgradewallet}, + {"wallet", &upgradetohd}, + {"wallet", &walletlock}, + {"wallet", &walletpassphrasechange}, + {"wallet", &walletpassphrase}, + {"wallet", &walletprocesspsbt}, + {"wallet", &walletcreatefundedpsbt}, + {"wallet", &wipewallettxes}, + }; return commands; } } // namespace wallet diff --git a/src/zmq/zmqrpc.cpp b/src/zmq/zmqrpc.cpp index 7aa933248a0b..7ae3cf0c1e65 100644 --- a/src/zmq/zmqrpc.cpp +++ b/src/zmq/zmqrpc.cpp @@ -51,10 +51,8 @@ static RPCHelpMan getzmqnotifications() }; } -const CRPCCommand commands[] = -{ // category actor (function) - // ----------------- ----------------------- - { "zmq", &getzmqnotifications, }, +const CRPCCommand commands[]{ + {"zmq", &getzmqnotifications}, }; } // anonymous namespace From 674557538e1f5db60b480a5ab6fabe604d79b2a3 Mon Sep 17 00:00:00 2001 From: MacroFake Date: Mon, 23 May 2022 09:40:49 +0200 Subject: [PATCH 02/10] Merge bitcoin/bitcoin#25184: refactor: Remove defunct attributes.h includes 71a8dbe5da0ec2c17c448eb3303eb30615869813 refactor: Remove defunct attributes.h includes (Ben Woosley) Pull request description: Since the removal of NODISCARD in 81d5af42f4dba5b68a597536cad7f61894dc22a3, the only attributes.h def is LIFETIMEBOUND, and it's included in many more places that it is used. This removes all includes which do not have an associated use of LIFETIMEBOUND, and adds it to the following files, due to their use of the same: * src/validationinterface.h * src/script/standard.h See also #20499. Top commit has no ACKs. Tree-SHA512: f3e10a5cda5ab78371b77b702f4a241ff69d490a16cc6059f1a4202b97c584accdbc951cc7b6120eae94bee3b9249e9117b45cf6ed1a5228ca23b5638fcf7b7b --- src/base58.h | 1 - src/core_io.h | 1 - src/init.cpp | 1 - src/netaddress.h | 1 - src/node/transaction.h | 1 - src/psbt.h | 1 - src/script/standard.h | 1 + src/test/fuzz/util.h | 1 - src/util/moneystr.h | 1 - src/util/strencodings.h | 1 - src/util/system.h | 1 - src/validationinterface.cpp | 1 + 12 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/base58.h b/src/base58.h index 9ba5af73e059..d2a8d5e3bc47 100644 --- a/src/base58.h +++ b/src/base58.h @@ -14,7 +14,6 @@ #ifndef BITCOIN_BASE58_H #define BITCOIN_BASE58_H -#include #include #include diff --git a/src/core_io.h b/src/core_io.h index d3f424d1363f..8dd365f95518 100644 --- a/src/core_io.h +++ b/src/core_io.h @@ -5,7 +5,6 @@ #ifndef BITCOIN_CORE_IO_H #define BITCOIN_CORE_IO_H -#include #include #include diff --git a/src/init.cpp b/src/init.cpp index 25b2ca72090c..805d208e2c55 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -121,7 +121,6 @@ #include #ifndef WIN32 -#include #include #include #include diff --git a/src/netaddress.h b/src/netaddress.h index 053b3369fc61..eb5a822a38a3 100644 --- a/src/netaddress.h +++ b/src/netaddress.h @@ -9,7 +9,6 @@ #include #endif -#include #include #include #include diff --git a/src/node/transaction.h b/src/node/transaction.h index 3156e841e594..9617c1f99b92 100644 --- a/src/node/transaction.h +++ b/src/node/transaction.h @@ -5,7 +5,6 @@ #ifndef BITCOIN_NODE_TRANSACTION_H #define BITCOIN_NODE_TRANSACTION_H -#include #include #include #include diff --git a/src/psbt.h b/src/psbt.h index d3d778d8952a..7069a58e61f0 100644 --- a/src/psbt.h +++ b/src/psbt.h @@ -5,7 +5,6 @@ #ifndef BITCOIN_PSBT_H #define BITCOIN_PSBT_H -#include #include #include #include diff --git a/src/script/standard.h b/src/script/standard.h index 650b95fac890..1b047f1925ce 100644 --- a/src/script/standard.h +++ b/src/script/standard.h @@ -6,6 +6,7 @@ #ifndef BITCOIN_SCRIPT_STANDARD_H #define BITCOIN_SCRIPT_STANDARD_H +#include #include