Browse Source

[wallet] Add RegisterWalletRPC() function to wallet/init.cpp

0.16
John Newbery 7 years ago
parent
commit
290f3c56d9
  1. 2
      src/init.cpp
  2. 8
      src/wallet/init.cpp
  3. 5
      src/wallet/init.h
  4. 3
      src/wallet/rpcwallet.cpp
  5. 3
      src/wallet/rpcwallet.h

2
src/init.cpp

@ -1017,7 +1017,7 @@ bool AppInitParameterInteraction() @@ -1017,7 +1017,7 @@ bool AppInitParameterInteraction()
RegisterAllCoreRPCCommands(tableRPC);
#ifdef ENABLE_WALLET
RegisterWalletRPCCommands(tableRPC);
RegisterWalletRPC(tableRPC);
#endif
nConnectTimeout = gArgs.GetArg("-timeout", DEFAULT_CONNECT_TIMEOUT);

8
src/wallet/init.cpp

@ -10,6 +10,7 @@ @@ -10,6 +10,7 @@
#include "utilmoneystr.h"
#include "validation.h"
#include "wallet/wallet.h"
#include "wallet/rpcwallet.h"
std::string GetWalletHelpString(bool showDebug)
{
@ -171,6 +172,13 @@ bool WalletParameterInteraction() @@ -171,6 +172,13 @@ bool WalletParameterInteraction()
return true;
}
void RegisterWalletRPC(CRPCTable &t)
{
if (gArgs.GetBoolArg("-disablewallet", false)) return;
RegisterWalletRPCCommands(t);
}
bool VerifyWallets()
{
if (gArgs.GetBoolArg("-disablewallet", DEFAULT_DISABLE_WALLET))

5
src/wallet/init.h

@ -8,12 +8,17 @@ @@ -8,12 +8,17 @@
#include <string>
class CRPCTable;
//! Return the wallets help message.
std::string GetWalletHelpString(bool showDebug);
//! Wallets parameter interaction
bool WalletParameterInteraction();
//! Register wallet RPCs.
void RegisterWalletRPC(CRPCTable &tableRPC);
//! Responsible for reading and validating the -wallet arguments and verifying the wallet database.
// This function will perform salvage on the wallet if requested, as long as only one wallet is
// being loaded (CWallet::ParameterInteraction forbids -salvagewallet, -zapwallettxes or -upgradewallet with multiwallet).

3
src/wallet/rpcwallet.cpp

@ -3217,9 +3217,6 @@ static const CRPCCommand commands[] = @@ -3217,9 +3217,6 @@ static const CRPCCommand commands[] =
void RegisterWalletRPCCommands(CRPCTable &t)
{
if (gArgs.GetBoolArg("-disablewallet", false))
return;
for (unsigned int vcidx = 0; vcidx < ARRAYLEN(commands); vcidx++)
t.appendCommand(commands[vcidx].name, &commands[vcidx]);
}

3
src/wallet/rpcwallet.h

@ -5,7 +5,10 @@ @@ -5,7 +5,10 @@
#ifndef BITCOIN_WALLET_RPCWALLET_H
#define BITCOIN_WALLET_RPCWALLET_H
#include <string>
class CRPCTable;
class CWallet;
class JSONRPCRequest;
void RegisterWalletRPCCommands(CRPCTable &t);

Loading…
Cancel
Save