diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-29 16:04:29 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-12-04 12:46:13 +0100 |
| commit | 48ba56cdfd1f0d2478b0d8cffb828efb6982ed76 (patch) | |
| tree | 9616a93d913e09f9a7b63878c107a591615cc6e0 /src/rpcnet.cpp | |
| parent | 991685d3dc208cfcbc2f27900a7252fb14c8f7ad (diff) | |
| download | bitcoin-48ba56cdfd1f0d2478b0d8cffb828efb6982ed76.tar.xz | |
Delimit code with #ifdef ENABLE_WALLET
Delimit all code that uses the wallet functions
in implementation files that conditionally use the wallet.
Diffstat (limited to 'src/rpcnet.cpp')
| -rw-r--r-- | src/rpcnet.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/rpcnet.cpp b/src/rpcnet.cpp index 71b55bca1e..89bf53060e 100644 --- a/src/rpcnet.cpp +++ b/src/rpcnet.cpp @@ -1,15 +1,16 @@ // Copyright (c) 2009-2013 The Bitcoin developers // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "rpcserver.h" #include "net.h" #include "netbase.h" #include "protocol.h" #include "sync.h" #include "util.h" +#ifdef ENABLE_WALLET #include "wallet.h" // for getinfo #include "init.h" // for getinfo +#endif #include "main.h" // for getinfo #include <inttypes.h> @@ -368,23 +369,29 @@ Value getinfo(const Array& params, bool fHelp) Object obj; obj.push_back(Pair("version", (int)CLIENT_VERSION)); obj.push_back(Pair("protocolversion",(int)PROTOCOL_VERSION)); +#ifdef ENABLE_WALLET if (pwalletMain) { obj.push_back(Pair("walletversion", pwalletMain->GetVersion())); obj.push_back(Pair("balance", ValueFromAmount(pwalletMain->GetBalance()))); } +#endif obj.push_back(Pair("blocks", (int)chainActive.Height())); obj.push_back(Pair("timeoffset", (boost::int64_t)GetTimeOffset())); obj.push_back(Pair("connections", (int)vNodes.size())); obj.push_back(Pair("proxy", (proxy.first.IsValid() ? proxy.first.ToStringIPPort() : string()))); obj.push_back(Pair("difficulty", (double)GetDifficulty())); obj.push_back(Pair("testnet", TestNet())); +#ifdef ENABLE_WALLET if (pwalletMain) { obj.push_back(Pair("keypoololdest", (boost::int64_t)pwalletMain->GetOldestKeyPoolTime())); obj.push_back(Pair("keypoolsize", (int)pwalletMain->GetKeyPoolSize())); } +#endif obj.push_back(Pair("paytxfee", ValueFromAmount(nTransactionFee))); +#ifdef ENABLE_WALLET if (pwalletMain && pwalletMain->IsCrypted()) obj.push_back(Pair("unlocked_until", (boost::int64_t)nWalletUnlockTime)); +#endif obj.push_back(Pair("errors", GetWarnings("statusbar"))); return obj; } |