diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-25 16:51:49 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-06-25 17:00:09 +0200 |
| commit | 343feecf562a39e7d898ece2fd745fcb9d4c90e9 (patch) | |
| tree | f780cbfe1b73ae0765d1930595e59cf7b13b53d6 /src/rpcmining.cpp | |
| parent | 208bf5b9e0a86900bddf5722dc192c3262480e36 (diff) | |
| parent | 75c82d4923174a126e1b87be6a43f274d2cc4c9b (diff) | |
| download | bitcoin-343feecf562a39e7d898ece2fd745fcb9d4c90e9.tar.xz | |
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/rpcmining.cpp')
| -rw-r--r-- | src/rpcmining.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index f60070eb5b..0072557f87 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -237,7 +237,7 @@ Value getmininginfo(const Array& params, bool fHelp) obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1))); obj.push_back(Pair("networkhashps", getnetworkhashps(params, false))); obj.push_back(Pair("pooledtx", (uint64_t)mempool.size())); - obj.push_back(Pair("testnet", Params().NetworkID() == CChainParams::TESTNET)); + obj.push_back(Pair("testnet", Params().NetworkID() == CBaseChainParams::TESTNET)); obj.push_back(Pair("chain", Params().NetworkIDString())); #ifdef ENABLE_WALLET obj.push_back(Pair("generate", getgenerate(params, false))); |