diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2017-01-06 17:53:06 +0000 |
|---|---|---|
| committer | Luke Dashjr <luke-jr+git@utopios.org> | 2017-02-27 20:45:18 +0000 |
| commit | a4356328e00155796cd7aa188e96c51c09562423 (patch) | |
| tree | 4519a608a1a5eb62017c5dd454eed9351bdddbe4 /src/rpc | |
| parent | ad1573472e3eff7378f9e28e0d267f919c368907 (diff) | |
| download | bitcoin-a4356328e00155796cd7aa188e96c51c09562423.tar.xz | |
Move wallet RPC declarations to rpcwallet.h
Diffstat (limited to 'src/rpc')
| -rw-r--r-- | src/rpc/misc.cpp | 4 | ||||
| -rw-r--r-- | src/rpc/rawtransaction.cpp | 1 | ||||
| -rw-r--r-- | src/rpc/server.h | 11 |
3 files changed, 5 insertions, 11 deletions
diff --git a/src/rpc/misc.cpp b/src/rpc/misc.cpp index fe46f61d81..e543781e73 100644 --- a/src/rpc/misc.cpp +++ b/src/rpc/misc.cpp @@ -14,6 +14,7 @@ #include "util.h" #include "utilstrencodings.h" #ifdef ENABLE_WALLET +#include "wallet/rpcwallet.h" #include "wallet/wallet.h" #include "wallet/walletdb.h" #endif @@ -234,6 +235,9 @@ UniValue validateaddress(const JSONRPCRequest& request) return ret; } +// Needed even with !ENABLE_WALLET, to pass (ignored) pointers around +class CWallet; + /** * Used by addmultisigaddress / createmultisig: */ diff --git a/src/rpc/rawtransaction.cpp b/src/rpc/rawtransaction.cpp index ce7afcbe54..79b27d0475 100644 --- a/src/rpc/rawtransaction.cpp +++ b/src/rpc/rawtransaction.cpp @@ -24,6 +24,7 @@ #include "uint256.h" #include "utilstrencodings.h" #ifdef ENABLE_WALLET +#include "wallet/rpcwallet.h" #include "wallet/wallet.h" #endif diff --git a/src/rpc/server.h b/src/rpc/server.h index 0850f68f10..68d8a6ec96 100644 --- a/src/rpc/server.h +++ b/src/rpc/server.h @@ -196,17 +196,6 @@ extern double GetDifficulty(const CBlockIndex* blockindex = NULL); extern std::string HelpExampleCli(const std::string& methodname, const std::string& args); extern std::string HelpExampleRpc(const std::string& methodname, const std::string& args); -// Needed even with !ENABLE_WALLET, to pass (ignored) pointers around -class CWallet; - -#ifdef ENABLE_WALLET -// New code should accessing the wallet should be under the ../wallet/ directory -CWallet *GetWalletForJSONRPCRequest(const JSONRPCRequest&); -std::string HelpRequiringPassphrase(CWallet *); -void EnsureWalletIsUnlocked(CWallet *); -bool EnsureWalletIsAvailable(CWallet *, bool avoidException); -#endif - bool StartRPC(); void InterruptRPC(); void StopRPC(); |