rpc: Register calls where they are defined
Split out methods to every module, apart from 'help' and 'stop' which
are implemented in rpcserver.cpp itself.
- This makes it easier to add or remove RPC commands - no longer everything that includes
rpcserver.h has to be rebuilt when there's a change there.
- Cleans up `rpc/server.h` by getting rid of the huge cluttered list of function definitions.
- Removes most of the bitcoin-specific code from rpcserver.cpp and .h.
Continues #7307 for the non-wallet.
This commit is contained in:
Wladimir J. van der Laan
parent
5131005e5b
commit
fb8a8cf2e6
15 changed files with 165 additions and 137 deletions
|
|
@ -130,6 +130,7 @@ BITCOIN_CORE_H = \
|
||||||
rpc/client.h \
|
rpc/client.h \
|
||||||
rpc/protocol.h \
|
rpc/protocol.h \
|
||||||
rpc/server.h \
|
rpc/server.h \
|
||||||
|
rpc/register.h \
|
||||||
scheduler.h \
|
scheduler.h \
|
||||||
script/sigcache.h \
|
script/sigcache.h \
|
||||||
script/sign.h \
|
script/sign.h \
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@
|
||||||
#include "net.h"
|
#include "net.h"
|
||||||
#include "policy/policy.h"
|
#include "policy/policy.h"
|
||||||
#include "rpc/server.h"
|
#include "rpc/server.h"
|
||||||
|
#include "rpc/register.h"
|
||||||
#include "script/standard.h"
|
#include "script/standard.h"
|
||||||
#include "script/sigcache.h"
|
#include "script/sigcache.h"
|
||||||
#include "scheduler.h"
|
#include "scheduler.h"
|
||||||
|
|
@ -913,10 +914,11 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
|
||||||
fPruneMode = true;
|
fPruneMode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RegisterAllCoreRPCCommands(tableRPC);
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
bool fDisableWallet = GetBoolArg("-disablewallet", false);
|
bool fDisableWallet = GetBoolArg("-disablewallet", false);
|
||||||
if (!fDisableWallet)
|
if (!fDisableWallet)
|
||||||
walletRegisterRPCCommands();
|
RegisterWalletRPCCommands(tableRPC);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
|
nConnectTimeout = GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);
|
||||||
|
|
|
||||||
|
|
@ -273,6 +273,9 @@ static bool rest_block_notxdetails(HTTPRequest* req, const std::string& strURIPa
|
||||||
return rest_block(req, strURIPart, false);
|
return rest_block(req, strURIPart, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// A bit of a hack - dependency on a function defined in rpc/blockchain.cpp
|
||||||
|
UniValue getblockchaininfo(const UniValue& params, bool fHelp);
|
||||||
|
|
||||||
static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
|
static bool rest_chaininfo(HTTPRequest* req, const std::string& strURIPart)
|
||||||
{
|
{
|
||||||
if (!CheckWarmup(req))
|
if (!CheckWarmup(req))
|
||||||
|
|
|
||||||
|
|
@ -911,3 +911,31 @@ UniValue reconsiderblock(const UniValue& params, bool fHelp)
|
||||||
|
|
||||||
return NullUniValue;
|
return NullUniValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const CRPCCommand commands[] =
|
||||||
|
{ // category name actor (function) okSafeMode
|
||||||
|
// --------------------- ------------------------ ----------------------- ----------
|
||||||
|
{ "blockchain", "getblockchaininfo", &getblockchaininfo, true },
|
||||||
|
{ "blockchain", "getbestblockhash", &getbestblockhash, true },
|
||||||
|
{ "blockchain", "getblockcount", &getblockcount, true },
|
||||||
|
{ "blockchain", "getblock", &getblock, true },
|
||||||
|
{ "blockchain", "getblockhash", &getblockhash, true },
|
||||||
|
{ "blockchain", "getblockheader", &getblockheader, true },
|
||||||
|
{ "blockchain", "getchaintips", &getchaintips, true },
|
||||||
|
{ "blockchain", "getdifficulty", &getdifficulty, true },
|
||||||
|
{ "blockchain", "getmempoolinfo", &getmempoolinfo, true },
|
||||||
|
{ "blockchain", "getrawmempool", &getrawmempool, true },
|
||||||
|
{ "blockchain", "gettxout", &gettxout, true },
|
||||||
|
{ "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true },
|
||||||
|
{ "blockchain", "verifychain", &verifychain, true },
|
||||||
|
|
||||||
|
/* Not shown in help */
|
||||||
|
{ "hidden", "invalidateblock", &invalidateblock, true },
|
||||||
|
{ "hidden", "reconsiderblock", &reconsiderblock, true },
|
||||||
|
};
|
||||||
|
|
||||||
|
void RegisterBlockchainRPCCommands(CRPCTable &tableRPC)
|
||||||
|
{
|
||||||
|
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
|
||||||
|
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -781,3 +781,27 @@ UniValue estimatesmartpriority(const UniValue& params, bool fHelp)
|
||||||
result.push_back(Pair("blocks", answerFound));
|
result.push_back(Pair("blocks", answerFound));
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const CRPCCommand commands[] =
|
||||||
|
{ // category name actor (function) okSafeMode
|
||||||
|
// --------------------- ------------------------ ----------------------- ----------
|
||||||
|
{ "mining", "getnetworkhashps", &getnetworkhashps, true },
|
||||||
|
{ "mining", "getmininginfo", &getmininginfo, true },
|
||||||
|
{ "mining", "prioritisetransaction", &prioritisetransaction, true },
|
||||||
|
{ "mining", "getblocktemplate", &getblocktemplate, true },
|
||||||
|
{ "mining", "submitblock", &submitblock, true },
|
||||||
|
|
||||||
|
{ "generating", "generate", &generate, true },
|
||||||
|
{ "generating", "generatetoaddress", &generatetoaddress, true },
|
||||||
|
|
||||||
|
{ "util", "estimatefee", &estimatefee, true },
|
||||||
|
{ "util", "estimatepriority", &estimatepriority, true },
|
||||||
|
{ "util", "estimatesmartfee", &estimatesmartfee, true },
|
||||||
|
{ "util", "estimatesmartpriority", &estimatesmartpriority, true },
|
||||||
|
};
|
||||||
|
|
||||||
|
void RegisterMiningRPCCommands(CRPCTable &tableRPC)
|
||||||
|
{
|
||||||
|
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
|
||||||
|
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -396,3 +396,21 @@ UniValue setmocktime(const UniValue& params, bool fHelp)
|
||||||
|
|
||||||
return NullUniValue;
|
return NullUniValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const CRPCCommand commands[] =
|
||||||
|
{ // category name actor (function) okSafeMode
|
||||||
|
// --------------------- ------------------------ ----------------------- ----------
|
||||||
|
{ "control", "getinfo", &getinfo, true }, /* uses wallet if enabled */
|
||||||
|
{ "util", "validateaddress", &validateaddress, true }, /* uses wallet if enabled */
|
||||||
|
{ "util", "createmultisig", &createmultisig, true },
|
||||||
|
{ "util", "verifymessage", &verifymessage, true },
|
||||||
|
|
||||||
|
/* Not shown in help */
|
||||||
|
{ "hidden", "setmocktime", &setmocktime, true },
|
||||||
|
};
|
||||||
|
|
||||||
|
void RegisterMiscRPCCommands(CRPCTable &tableRPC)
|
||||||
|
{
|
||||||
|
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
|
||||||
|
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -626,3 +626,25 @@ UniValue clearbanned(const UniValue& params, bool fHelp)
|
||||||
|
|
||||||
return NullUniValue;
|
return NullUniValue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const CRPCCommand commands[] =
|
||||||
|
{ // category name actor (function) okSafeMode
|
||||||
|
// --------------------- ------------------------ ----------------------- ----------
|
||||||
|
{ "network", "getconnectioncount", &getconnectioncount, true },
|
||||||
|
{ "network", "ping", &ping, true },
|
||||||
|
{ "network", "getpeerinfo", &getpeerinfo, true },
|
||||||
|
{ "network", "addnode", &addnode, true },
|
||||||
|
{ "network", "disconnectnode", &disconnectnode, true },
|
||||||
|
{ "network", "getaddednodeinfo", &getaddednodeinfo, true },
|
||||||
|
{ "network", "getnettotals", &getnettotals, true },
|
||||||
|
{ "network", "getnetworkinfo", &getnetworkinfo, true },
|
||||||
|
{ "network", "setban", &setban, true },
|
||||||
|
{ "network", "listbanned", &listbanned, true },
|
||||||
|
{ "network", "clearbanned", &clearbanned, true },
|
||||||
|
};
|
||||||
|
|
||||||
|
void RegisterNetRPCCommands(CRPCTable &tableRPC)
|
||||||
|
{
|
||||||
|
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
|
||||||
|
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -841,3 +841,23 @@ UniValue sendrawtransaction(const UniValue& params, bool fHelp)
|
||||||
|
|
||||||
return hashTx.GetHex();
|
return hashTx.GetHex();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static const CRPCCommand commands[] =
|
||||||
|
{ // category name actor (function) okSafeMode
|
||||||
|
// --------------------- ------------------------ ----------------------- ----------
|
||||||
|
{ "rawtransactions", "getrawtransaction", &getrawtransaction, true },
|
||||||
|
{ "rawtransactions", "createrawtransaction", &createrawtransaction, true },
|
||||||
|
{ "rawtransactions", "decoderawtransaction", &decoderawtransaction, true },
|
||||||
|
{ "rawtransactions", "decodescript", &decodescript, true },
|
||||||
|
{ "rawtransactions", "sendrawtransaction", &sendrawtransaction, false },
|
||||||
|
{ "rawtransactions", "signrawtransaction", &signrawtransaction, false }, /* uses wallet if enabled */
|
||||||
|
|
||||||
|
{ "blockchain", "gettxoutproof", &gettxoutproof, true },
|
||||||
|
{ "blockchain", "verifytxoutproof", &verifytxoutproof, true },
|
||||||
|
};
|
||||||
|
|
||||||
|
void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC)
|
||||||
|
{
|
||||||
|
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
|
||||||
|
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
|
||||||
|
}
|
||||||
|
|
|
||||||
32
src/rpc/register.h
Normal file
32
src/rpc/register.h
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
// Copyright (c) 2009-2016 The Bitcoin Core developers
|
||||||
|
// Distributed under the MIT software license, see the accompanying
|
||||||
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||||
|
|
||||||
|
#ifndef BITCOIN_RPCREGISTER_H
|
||||||
|
#define BITCOIN_RPCREGISTER_H
|
||||||
|
|
||||||
|
/** These are in one header file to avoid creating tons of single-function
|
||||||
|
* headers for everything under src/rpc/ */
|
||||||
|
class CRPCTable;
|
||||||
|
|
||||||
|
/** Register block chain RPC commands */
|
||||||
|
void RegisterBlockchainRPCCommands(CRPCTable &tableRPC);
|
||||||
|
/** Register P2P networking RPC commands */
|
||||||
|
void RegisterNetRPCCommands(CRPCTable &tableRPC);
|
||||||
|
/** Register miscellaneous RPC commands */
|
||||||
|
void RegisterMiscRPCCommands(CRPCTable &tableRPC);
|
||||||
|
/** Register mining RPC commands */
|
||||||
|
void RegisterMiningRPCCommands(CRPCTable &tableRPC);
|
||||||
|
/** Register raw transaction RPC commands */
|
||||||
|
void RegisterRawTransactionRPCCommands(CRPCTable &tableRPC);
|
||||||
|
|
||||||
|
static inline void RegisterAllCoreRPCCommands(CRPCTable &tableRPC)
|
||||||
|
{
|
||||||
|
RegisterBlockchainRPCCommands(tableRPC);
|
||||||
|
RegisterNetRPCCommands(tableRPC);
|
||||||
|
RegisterMiscRPCCommands(tableRPC);
|
||||||
|
RegisterMiningRPCCommands(tableRPC);
|
||||||
|
RegisterRawTransactionRPCCommands(tableRPC);
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
@ -256,72 +256,8 @@ static const CRPCCommand vRPCCommands[] =
|
||||||
{ // category name actor (function) okSafeMode
|
{ // category name actor (function) okSafeMode
|
||||||
// --------------------- ------------------------ ----------------------- ----------
|
// --------------------- ------------------------ ----------------------- ----------
|
||||||
/* Overall control/query calls */
|
/* Overall control/query calls */
|
||||||
{ "control", "getinfo", &getinfo, true }, /* uses wallet if enabled */
|
|
||||||
{ "control", "help", &help, true },
|
{ "control", "help", &help, true },
|
||||||
{ "control", "stop", &stop, true },
|
{ "control", "stop", &stop, true },
|
||||||
|
|
||||||
/* P2P networking */
|
|
||||||
{ "network", "getnetworkinfo", &getnetworkinfo, true },
|
|
||||||
{ "network", "addnode", &addnode, true },
|
|
||||||
{ "network", "disconnectnode", &disconnectnode, true },
|
|
||||||
{ "network", "getaddednodeinfo", &getaddednodeinfo, true },
|
|
||||||
{ "network", "getconnectioncount", &getconnectioncount, true },
|
|
||||||
{ "network", "getnettotals", &getnettotals, true },
|
|
||||||
{ "network", "getpeerinfo", &getpeerinfo, true },
|
|
||||||
{ "network", "ping", &ping, true },
|
|
||||||
{ "network", "setban", &setban, true },
|
|
||||||
{ "network", "listbanned", &listbanned, true },
|
|
||||||
{ "network", "clearbanned", &clearbanned, true },
|
|
||||||
|
|
||||||
/* Block chain and UTXO */
|
|
||||||
{ "blockchain", "getblockchaininfo", &getblockchaininfo, true },
|
|
||||||
{ "blockchain", "getbestblockhash", &getbestblockhash, true },
|
|
||||||
{ "blockchain", "getblockcount", &getblockcount, true },
|
|
||||||
{ "blockchain", "getblock", &getblock, true },
|
|
||||||
{ "blockchain", "getblockhash", &getblockhash, true },
|
|
||||||
{ "blockchain", "getblockheader", &getblockheader, true },
|
|
||||||
{ "blockchain", "getchaintips", &getchaintips, true },
|
|
||||||
{ "blockchain", "getdifficulty", &getdifficulty, true },
|
|
||||||
{ "blockchain", "getmempoolinfo", &getmempoolinfo, true },
|
|
||||||
{ "blockchain", "getrawmempool", &getrawmempool, true },
|
|
||||||
{ "blockchain", "gettxout", &gettxout, true },
|
|
||||||
{ "blockchain", "gettxoutproof", &gettxoutproof, true },
|
|
||||||
{ "blockchain", "verifytxoutproof", &verifytxoutproof, true },
|
|
||||||
{ "blockchain", "gettxoutsetinfo", &gettxoutsetinfo, true },
|
|
||||||
{ "blockchain", "verifychain", &verifychain, true },
|
|
||||||
|
|
||||||
/* Mining */
|
|
||||||
{ "mining", "getblocktemplate", &getblocktemplate, true },
|
|
||||||
{ "mining", "getmininginfo", &getmininginfo, true },
|
|
||||||
{ "mining", "getnetworkhashps", &getnetworkhashps, true },
|
|
||||||
{ "mining", "prioritisetransaction", &prioritisetransaction, true },
|
|
||||||
{ "mining", "submitblock", &submitblock, true },
|
|
||||||
|
|
||||||
/* Coin generation */
|
|
||||||
{ "generating", "generate", &generate, true },
|
|
||||||
{ "generating", "generatetoaddress", &generatetoaddress, true },
|
|
||||||
|
|
||||||
/* Raw transactions */
|
|
||||||
{ "rawtransactions", "createrawtransaction", &createrawtransaction, true },
|
|
||||||
{ "rawtransactions", "decoderawtransaction", &decoderawtransaction, true },
|
|
||||||
{ "rawtransactions", "decodescript", &decodescript, true },
|
|
||||||
{ "rawtransactions", "getrawtransaction", &getrawtransaction, true },
|
|
||||||
{ "rawtransactions", "sendrawtransaction", &sendrawtransaction, false },
|
|
||||||
{ "rawtransactions", "signrawtransaction", &signrawtransaction, false }, /* uses wallet if enabled */
|
|
||||||
|
|
||||||
/* Utility functions */
|
|
||||||
{ "util", "createmultisig", &createmultisig, true },
|
|
||||||
{ "util", "validateaddress", &validateaddress, true }, /* uses wallet if enabled */
|
|
||||||
{ "util", "verifymessage", &verifymessage, true },
|
|
||||||
{ "util", "estimatefee", &estimatefee, true },
|
|
||||||
{ "util", "estimatepriority", &estimatepriority, true },
|
|
||||||
{ "util", "estimatesmartfee", &estimatesmartfee, true },
|
|
||||||
{ "util", "estimatesmartpriority", &estimatesmartpriority, true },
|
|
||||||
|
|
||||||
/* Not shown in help */
|
|
||||||
{ "hidden", "invalidateblock", &invalidateblock, true },
|
|
||||||
{ "hidden", "reconsiderblock", &reconsiderblock, true },
|
|
||||||
{ "hidden", "setmocktime", &setmocktime, true },
|
|
||||||
};
|
};
|
||||||
|
|
||||||
CRPCTable::CRPCTable()
|
CRPCTable::CRPCTable()
|
||||||
|
|
|
||||||
|
|
@ -181,65 +181,6 @@ extern std::string HelpExampleRpc(const std::string& methodname, const std::stri
|
||||||
|
|
||||||
extern void EnsureWalletIsUnlocked();
|
extern void EnsureWalletIsUnlocked();
|
||||||
|
|
||||||
extern UniValue getconnectioncount(const UniValue& params, bool fHelp); // in rpc/net.cpp
|
|
||||||
extern UniValue getpeerinfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue ping(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue addnode(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue disconnectnode(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getaddednodeinfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getnettotals(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue setban(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue listbanned(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue clearbanned(const UniValue& params, bool fHelp);
|
|
||||||
|
|
||||||
extern UniValue generate(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue generatetoaddress(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getnetworkhashps(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getmininginfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue prioritisetransaction(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getblocktemplate(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue submitblock(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue estimatefee(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue estimatepriority(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue estimatesmartfee(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue estimatesmartpriority(const UniValue& params, bool fHelp);
|
|
||||||
|
|
||||||
extern UniValue verifymessage(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue createmultisig(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue validateaddress(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getinfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getblockchaininfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getnetworkinfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue setmocktime(const UniValue& params, bool fHelp);
|
|
||||||
|
|
||||||
extern UniValue getrawtransaction(const UniValue& params, bool fHelp); // in rpc/rawtransaction.cpp
|
|
||||||
extern UniValue listunspent(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue lockunspent(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue listlockunspent(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue createrawtransaction(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue decoderawtransaction(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue decodescript(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue signrawtransaction(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue sendrawtransaction(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue gettxoutproof(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue verifytxoutproof(const UniValue& params, bool fHelp);
|
|
||||||
|
|
||||||
extern UniValue getblockcount(const UniValue& params, bool fHelp); // in rpc/blockchain.cpp
|
|
||||||
extern UniValue getbestblockhash(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getdifficulty(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue settxfee(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getmempoolinfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getrawmempool(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getblockhash(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getblockheader(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getblock(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue gettxoutsetinfo(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue gettxout(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue verifychain(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue getchaintips(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue invalidateblock(const UniValue& params, bool fHelp);
|
|
||||||
extern UniValue reconsiderblock(const UniValue& params, bool fHelp);
|
|
||||||
|
|
||||||
bool StartRPC();
|
bool StartRPC();
|
||||||
void InterruptRPC();
|
void InterruptRPC();
|
||||||
void StopRPC();
|
void StopRPC();
|
||||||
|
|
|
||||||
|
|
@ -36,7 +36,7 @@ UniValue CallRPC(string args)
|
||||||
string strMethod = vArgs[0];
|
string strMethod = vArgs[0];
|
||||||
vArgs.erase(vArgs.begin());
|
vArgs.erase(vArgs.begin());
|
||||||
UniValue params = RPCConvertValues(strMethod, vArgs);
|
UniValue params = RPCConvertValues(strMethod, vArgs);
|
||||||
|
BOOST_CHECK(tableRPC[strMethod]);
|
||||||
rpcfn_type method = tableRPC[strMethod]->actor;
|
rpcfn_type method = tableRPC[strMethod]->actor;
|
||||||
try {
|
try {
|
||||||
UniValue result = (*method)(params, false);
|
UniValue result = (*method)(params, false);
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,8 @@
|
||||||
#include "txdb.h"
|
#include "txdb.h"
|
||||||
#include "txmempool.h"
|
#include "txmempool.h"
|
||||||
#include "ui_interface.h"
|
#include "ui_interface.h"
|
||||||
|
#include "rpc/server.h"
|
||||||
|
#include "rpc/register.h"
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
#include "wallet/db.h"
|
#include "wallet/db.h"
|
||||||
#include "wallet/wallet.h"
|
#include "wallet/wallet.h"
|
||||||
|
|
@ -53,9 +55,12 @@ BasicTestingSetup::~BasicTestingSetup()
|
||||||
TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
|
TestingSetup::TestingSetup(const std::string& chainName) : BasicTestingSetup(chainName)
|
||||||
{
|
{
|
||||||
const CChainParams& chainparams = Params();
|
const CChainParams& chainparams = Params();
|
||||||
|
// Ideally we'd move all the RPC tests to the functional testing framework
|
||||||
|
// instead of unit tests, but for now we need these here.
|
||||||
|
RegisterAllCoreRPCCommands(tableRPC);
|
||||||
#ifdef ENABLE_WALLET
|
#ifdef ENABLE_WALLET
|
||||||
bitdb.MakeMock();
|
bitdb.MakeMock();
|
||||||
walletRegisterRPCCommands();
|
RegisterWalletRPCCommands(tableRPC);
|
||||||
#endif
|
#endif
|
||||||
ClearDatadirCache();
|
ClearDatadirCache();
|
||||||
pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
|
pathTemp = GetTempPath() / strprintf("test_bitcoin_%lu_%i", (unsigned long)GetTime(), (int)(GetRand(100000)));
|
||||||
|
|
|
||||||
|
|
@ -2509,7 +2509,7 @@ extern UniValue importwallet(const UniValue& params, bool fHelp);
|
||||||
extern UniValue importprunedfunds(const UniValue& params, bool fHelp);
|
extern UniValue importprunedfunds(const UniValue& params, bool fHelp);
|
||||||
extern UniValue removeprunedfunds(const UniValue& params, bool fHelp);
|
extern UniValue removeprunedfunds(const UniValue& params, bool fHelp);
|
||||||
|
|
||||||
const CRPCCommand vWalletRPCCommands[] =
|
static const CRPCCommand commands[] =
|
||||||
{ // category name actor (function) okSafeMode
|
{ // category name actor (function) okSafeMode
|
||||||
// --------------------- ------------------------ ----------------------- ----------
|
// --------------------- ------------------------ ----------------------- ----------
|
||||||
{ "rawtransactions", "fundrawtransaction", &fundrawtransaction, false },
|
{ "rawtransactions", "fundrawtransaction", &fundrawtransaction, false },
|
||||||
|
|
@ -2559,14 +2559,8 @@ const CRPCCommand vWalletRPCCommands[] =
|
||||||
{ "wallet", "removeprunedfunds", &removeprunedfunds, true },
|
{ "wallet", "removeprunedfunds", &removeprunedfunds, true },
|
||||||
};
|
};
|
||||||
|
|
||||||
void walletRegisterRPCCommands()
|
void RegisterWalletRPCCommands(CRPCTable &tableRPC)
|
||||||
{
|
{
|
||||||
unsigned int vcidx;
|
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
|
||||||
for (vcidx = 0; vcidx < ARRAYLEN(vWalletRPCCommands); vcidx++)
|
tableRPC.appendCommand(commands[vcidx].name, &commands[vcidx]);
|
||||||
{
|
|
||||||
const CRPCCommand *pcmd;
|
|
||||||
|
|
||||||
pcmd = &vWalletRPCCommands[vcidx];
|
|
||||||
tableRPC.appendCommand(pcmd->name, pcmd);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -5,6 +5,8 @@
|
||||||
#ifndef BITCOIN_WALLET_RPCWALLET_H
|
#ifndef BITCOIN_WALLET_RPCWALLET_H
|
||||||
#define BITCOIN_WALLET_RPCWALLET_H
|
#define BITCOIN_WALLET_RPCWALLET_H
|
||||||
|
|
||||||
void walletRegisterRPCCommands();
|
class CRPCTable;
|
||||||
|
|
||||||
|
void RegisterWalletRPCCommands(CRPCTable &tableRPC);
|
||||||
|
|
||||||
#endif //BITCOIN_WALLET_RPCWALLET_H
|
#endif //BITCOIN_WALLET_RPCWALLET_H
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue