Skip to content

Commit 5ebe095

Browse files
laanwjlaanwj
committed
Trim RPC command table
- invalidateblock and reconsiderblock were defined doubly - remove no-longer-used threadSafe, as locks have been pushed down
1 parent 4401b2d commit 5ebe095

File tree

2 files changed

+84
-87
lines changed

2 files changed

+84
-87
lines changed

‎src/rpcserver.cpp‎

Lines changed: 84 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -271,112 +271,110 @@ Value stop(const Array& params, bool fHelp)
271271
* Call Table
272272
*/
273273
static const CRPCCommand vRPCCommands[] =
274-
{ // category name actor (function) okSafeMode threadSafe reqWallet
275-
// --------------------- ------------------------ ----------------------- ---------- ---------- ---------
274+
{ // category name actor (function) okSafeMode reqWallet
275+
// --------------------- ------------------------ ----------------------- ---------- ---------
276276
/* Overall control/query calls */
277-
{ "control", "getinfo", &getinfo, true, false, false }, /* uses wallet if enabled */
278-
{ "control", "help", &help, true, true, false },
279-
{ "control", "stop", &stop, true, true, false },
277+
{ "control", "getinfo", &getinfo, true, false }, /* uses wallet if enabled */
278+
{ "control", "help", &help, true, false },
279+
{ "control", "stop", &stop, true, false },
280280

281281
/* P2P networking */
282-
{ "network", "getnetworkinfo", &getnetworkinfo, true, false, false },
283-
{ "network", "addnode", &addnode, true, true, false },
284-
{ "network", "getaddednodeinfo", &getaddednodeinfo, true, true, false },
285-
{ "network", "getconnectioncount", &getconnectioncount, true, false, false },
286-
{ "network", "getnettotals", &getnettotals, true, true, false },
287-
{ "network", "getpeerinfo", &getpeerinfo, true, false, false },
288-
{ "network", "ping", &ping, true, false, false },
282+
{ "network", "getnetworkinfo", &getnetworkinfo, true, false },
283+
{ "network", "addnode", &addnode, true, false },
284+
{ "network", "getaddednodeinfo", &getaddednodeinfo, true, false },
285+
{ "network", "getconnectioncount", &getconnectioncount, true, false },
286+
{ "network", "getnettotals", &getnettotals, true, false },
287+
{ "network", "getpeerinfo", &getpeerinfo, true, false },
288+
{ "network", "ping", &ping, true, false },
289289

290290
/* Block chain and UTXO */
291-
{ "blockchain", "getblockchaininfo", &getblockchaininfo, true, false, false },
292-
{ "blockchain", "getbestblockhash", &getbestblockhash, true, false, false },
293-
{ "blockchain", "getblockcount", &getblockcount, true, false, false },
294-
{ "blockchain", "getblock", &getblock, true, false, false },
295-
{ "blockchain", "getblockhash", &getblockhash, true, false, false },
296-
{ "blockchain", "getchaintips", &getchaintips, true, false, false },
297-
{ "blockchain", "getdifficulty", &getdifficulty, true, false, false },
298-
{ "blockchain", "getmempoolinfo", &getmempoolinfo, true, true, false },
299-
{ "blockchain", "getrawmempool", &getrawmempool, true, false, false },
300-
{ "blockchain", "gettxout", &gettxout, true, false, false },
301-
{ "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true, false, false },
302-
{ "blockchain", "verifychain", &verifychain, true, false, false },
303-
{ "blockchain", "invalidateblock", &invalidateblock, true, true, false },
304-
{ "blockchain", "reconsiderblock", &reconsiderblock, true, true, false },
291+
{ "blockchain", "getblockchaininfo", &getblockchaininfo, true, false },
292+
{ "blockchain", "getbestblockhash", &getbestblockhash, true, false },
293+
{ "blockchain", "getblockcount", &getblockcount, true, false },
294+
{ "blockchain", "getblock", &getblock, true, false },
295+
{ "blockchain", "getblockhash", &getblockhash, true, false },
296+
{ "blockchain", "getchaintips", &getchaintips, true, false },
297+
{ "blockchain", "getdifficulty", &getdifficulty, true, false },
298+
{ "blockchain", "getmempoolinfo", &getmempoolinfo, true, false },
299+
{ "blockchain", "getrawmempool", &getrawmempool, true, false },
300+
{ "blockchain", "gettxout", &gettxout, true, false },
301+
{ "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true, false },
302+
{ "blockchain", "verifychain", &verifychain, true, false },
305303

306304
/* Mining */
307-
{ "mining", "getblocktemplate", &getblocktemplate, true, false, false },
308-
{ "mining", "getmininginfo", &getmininginfo, true, false, false },
309-
{ "mining", "getnetworkhashps", &getnetworkhashps, true, false, false },
310-
{ "mining", "prioritisetransaction", &prioritisetransaction, true, false, false },
311-
{ "mining", "submitblock", &submitblock, true, true, false },
305+
{ "mining", "getblocktemplate", &getblocktemplate, true, false },
306+
{ "mining", "getmininginfo", &getmininginfo, true, false },
307+
{ "mining", "getnetworkhashps", &getnetworkhashps, true, false },
308+
{ "mining", "prioritisetransaction", &prioritisetransaction, true, false },
309+
{ "mining", "submitblock", &submitblock, true, false },
312310

313311
#ifdef ENABLE_WALLET
314312
/* Coin generation */
315-
{ "generating", "getgenerate", &getgenerate, true, false, false },
316-
{ "generating", "setgenerate", &setgenerate, true, true, false },
313+
{ "generating", "getgenerate", &getgenerate, true, false },
314+
{ "generating", "setgenerate", &setgenerate, true, false },
317315
#endif
318316

319317
/* Raw transactions */
320-
{ "rawtransactions", "createrawtransaction", &createrawtransaction, true, false, false },
321-
{ "rawtransactions", "decoderawtransaction", &decoderawtransaction, true, false, false },
322-
{ "rawtransactions", "decodescript", &decodescript, true, false, false },
323-
{ "rawtransactions", "getrawtransaction", &getrawtransaction, true, false, false },
324-
{ "rawtransactions", "sendrawtransaction", &sendrawtransaction, false, false, false },
325-
{ "rawtransactions", "signrawtransaction", &signrawtransaction, false, false, false }, /* uses wallet if enabled */
318+
{ "rawtransactions", "createrawtransaction", &createrawtransaction, true, false },
319+
{ "rawtransactions", "decoderawtransaction", &decoderawtransaction, true, false },
320+
{ "rawtransactions", "decodescript", &decodescript, true, false },
321+
{ "rawtransactions", "getrawtransaction", &getrawtransaction, true, false },
322+
{ "rawtransactions", "sendrawtransaction", &sendrawtransaction, false, false },
323+
{ "rawtransactions", "signrawtransaction", &signrawtransaction, false, false }, /* uses wallet if enabled */
326324

327325
/* Utility functions */
328-
{ "util", "createmultisig", &createmultisig, true, true , false },
329-
{ "util", "validateaddress", &validateaddress, true, false, false }, /* uses wallet if enabled */
330-
{ "util", "verifymessage", &verifymessage, true, false, false },
331-
{ "util", "estimatefee", &estimatefee, true, true, false },
332-
{ "util", "estimatepriority", &estimatepriority, true, true, false },
326+
{ "util", "createmultisig", &createmultisig, true, false },
327+
{ "util", "validateaddress", &validateaddress, true, false }, /* uses wallet if enabled */
328+
{ "util", "verifymessage", &verifymessage, true, false },
329+
{ "util", "estimatefee", &estimatefee, true, false },
330+
{ "util", "estimatepriority", &estimatepriority, true, false },
333331

334332
/* Not shown in help */
335-
{ "hidden", "invalidateblock", &invalidateblock, true, true, false },
336-
{ "hidden", "reconsiderblock", &reconsiderblock, true, true, false },
337-
{ "hidden", "setmocktime", &setmocktime, true, false, false },
333+
{ "hidden", "invalidateblock", &invalidateblock, true, false },
334+
{ "hidden", "reconsiderblock", &reconsiderblock, true, false },
335+
{ "hidden", "setmocktime", &setmocktime, true, false },
338336

339337
#ifdef ENABLE_WALLET
340338
/* Wallet */
341-
{ "wallet", "addmultisigaddress", &addmultisigaddress, true, false, true },
342-
{ "wallet", "backupwallet", &backupwallet, true, false, true },
343-
{ "wallet", "dumpprivkey", &dumpprivkey, true, false, true },
344-
{ "wallet", "dumpwallet", &dumpwallet, true, false, true },
345-
{ "wallet", "encryptwallet", &encryptwallet, true, false, true },
346-
{ "wallet", "getaccountaddress", &getaccountaddress, true, false, true },
347-
{ "wallet", "getaccount", &getaccount, true, false, true },
348-
{ "wallet", "getaddressesbyaccount", &getaddressesbyaccount, true, false, true },
349-
{ "wallet", "getbalance", &getbalance, false, false, true },
350-
{ "wallet", "getnewaddress", &getnewaddress, true, false, true },
351-
{ "wallet", "getrawchangeaddress", &getrawchangeaddress, true, false, true },
352-
{ "wallet", "getreceivedbyaccount", &getreceivedbyaccount, false, false, true },
353-
{ "wallet", "getreceivedbyaddress", &getreceivedbyaddress, false, false, true },
354-
{ "wallet", "gettransaction", &gettransaction, false, false, true },
355-
{ "wallet", "getunconfirmedbalance", &getunconfirmedbalance, false, false, true },
356-
{ "wallet", "getwalletinfo", &getwalletinfo, false, false, true },
357-
{ "wallet", "importprivkey", &importprivkey, true, false, true },
358-
{ "wallet", "importwallet", &importwallet, true, false, true },
359-
{ "wallet", "importaddress", &importaddress, true, false, true },
360-
{ "wallet", "keypoolrefill", &keypoolrefill, true, false, true },
361-
{ "wallet", "listaccounts", &listaccounts, false, false, true },
362-
{ "wallet", "listaddressgroupings", &listaddressgroupings, false, false, true },
363-
{ "wallet", "listlockunspent", &listlockunspent, false, false, true },
364-
{ "wallet", "listreceivedbyaccount", &listreceivedbyaccount, false, false, true },
365-
{ "wallet", "listreceivedbyaddress", &listreceivedbyaddress, false, false, true },
366-
{ "wallet", "listsinceblock", &listsinceblock, false, false, true },
367-
{ "wallet", "listtransactions", &listtransactions, false, false, true },
368-
{ "wallet", "listunspent", &listunspent, false, false, true },
369-
{ "wallet", "lockunspent", &lockunspent, true, false, true },
370-
{ "wallet", "move", &movecmd, false, false, true },
371-
{ "wallet", "sendfrom", &sendfrom, false, false, true },
372-
{ "wallet", "sendmany", &sendmany, false, false, true },
373-
{ "wallet", "sendtoaddress", &sendtoaddress, false, false, true },
374-
{ "wallet", "setaccount", &setaccount, true, false, true },
375-
{ "wallet", "settxfee", &settxfee, true, false, true },
376-
{ "wallet", "signmessage", &signmessage, true, false, true },
377-
{ "wallet", "walletlock", &walletlock, true, false, true },
378-
{ "wallet", "walletpassphrasechange", &walletpassphrasechange, true, false, true },
379-
{ "wallet", "walletpassphrase", &walletpassphrase, true, false, true },
339+
{ "wallet", "addmultisigaddress", &addmultisigaddress, true, true },
340+
{ "wallet", "backupwallet", &backupwallet, true, true },
341+
{ "wallet", "dumpprivkey", &dumpprivkey, true, true },
342+
{ "wallet", "dumpwallet", &dumpwallet, true, true },
343+
{ "wallet", "encryptwallet", &encryptwallet, true, true },
344+
{ "wallet", "getaccountaddress", &getaccountaddress, true, true },
345+
{ "wallet", "getaccount", &getaccount, true, true },
346+
{ "wallet", "getaddressesbyaccount", &getaddressesbyaccount, true, true },
347+
{ "wallet", "getbalance", &getbalance, false, true },
348+
{ "wallet", "getnewaddress", &getnewaddress, true, true },
349+
{ "wallet", "getrawchangeaddress", &getrawchangeaddress, true, true },
350+
{ "wallet", "getreceivedbyaccount", &getreceivedbyaccount, false, true },
351+
{ "wallet", "getreceivedbyaddress", &getreceivedbyaddress, false, true },
352+
{ "wallet", "gettransaction", &gettransaction, false, true },
353+
{ "wallet", "getunconfirmedbalance", &getunconfirmedbalance, false, true },
354+
{ "wallet", "getwalletinfo", &getwalletinfo, false, true },
355+
{ "wallet", "importprivkey", &importprivkey, true, true },
356+
{ "wallet", "importwallet", &importwallet, true, true },
357+
{ "wallet", "importaddress", &importaddress, true, true },
358+
{ "wallet", "keypoolrefill", &keypoolrefill, true, true },
359+
{ "wallet", "listaccounts", &listaccounts, false, true },
360+
{ "wallet", "listaddressgroupings", &listaddressgroupings, false, true },
361+
{ "wallet", "listlockunspent", &listlockunspent, false, true },
362+
{ "wallet", "listreceivedbyaccount", &listreceivedbyaccount, false, true },
363+
{ "wallet", "listreceivedbyaddress", &listreceivedbyaddress, false, true },
364+
{ "wallet", "listsinceblock", &listsinceblock, false, true },
365+
{ "wallet", "listtransactions", &listtransactions, false, true },
366+
{ "wallet", "listunspent", &listunspent, false, true },
367+
{ "wallet", "lockunspent", &lockunspent, true, true },
368+
{ "wallet", "move", &movecmd, false, true },
369+
{ "wallet", "sendfrom", &sendfrom, false, true },
370+
{ "wallet", "sendmany", &sendmany, false, true },
371+
{ "wallet", "sendtoaddress", &sendtoaddress, false, true },
372+
{ "wallet", "setaccount", &setaccount, true, true },
373+
{ "wallet", "settxfee", &settxfee, true, true },
374+
{ "wallet", "signmessage", &signmessage, true, true },
375+
{ "wallet", "walletlock", &walletlock, true, true },
376+
{ "wallet", "walletpassphrasechange", &walletpassphrasechange, true, true },
377+
{ "wallet", "walletpassphrase", &walletpassphrase, true, true },
380378
#endif // ENABLE_WALLET
381379
};
382380

‎src/rpcserver.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@ class CRPCCommand
9898
std::string name;
9999
rpcfn_type actor;
100100
bool okSafeMode;
101-
bool threadSafe;
102101
bool reqWallet;
103102
};
104103

0 commit comments

Comments
 (0)