diff options
| author | Wladimir J. van der Laan <[email protected]> | 2014-06-25 16:51:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2014-06-25 17:00:09 +0200 |
| commit | 343feecf562a39e7d898ece2fd745fcb9d4c90e9 (patch) | |
| tree | f780cbfe1b73ae0765d1930595e59cf7b13b53d6 /src/rpcmisc.cpp | |
| parent | Merge pull request #3839 (diff) | |
| parent | Move coins.cpp and keystore.cpp to libbitcoin_common (diff) | |
| download | discoin-343feecf562a39e7d898ece2fd745fcb9d4c90e9.tar.xz discoin-343feecf562a39e7d898ece2fd745fcb9d4c90e9.zip | |
Merge pull request #4368
75c82d4 Move coins.cpp and keystore.cpp to libbitcoin_common (Wladimir J. van der Laan)
84ce18c Remove unnecessary dependencies for bitcoin-cli (Wladimir J. van der Laan)
14f888c Move network-time related functions to timedata.cpp/h (Wladimir J. van der Laan)
Diffstat (limited to 'src/rpcmisc.cpp')
| -rw-r--r-- | src/rpcmisc.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpcmisc.cpp b/src/rpcmisc.cpp index 5181aa23d..a300de268 100644 --- a/src/rpcmisc.cpp +++ b/src/rpcmisc.cpp @@ -9,6 +9,7 @@ #include "net.h" #include "netbase.h" #include "rpcserver.h" +#include "timedata.h" #include "util.h" #ifdef ENABLE_WALLET #include "wallet.h" @@ -73,7 +74,7 @@ Value getinfo(const Array& params, bool fHelp) 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", Params().NetworkID() == CChainParams::TESTNET)); + obj.push_back(Pair("testnet", Params().NetworkID() == CBaseChainParams::TESTNET)); #ifdef ENABLE_WALLET if (pwalletMain) { obj.push_back(Pair("keypoololdest", pwalletMain->GetOldestKeyPoolTime())); |