diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-10 11:36:42 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2014-10-10 11:56:58 +0200 |
| commit | 023690c0f24a06853bb860db032a1ff67978ee74 (patch) | |
| tree | 32843e65dc50a3f49ea051b73b821e87d1451cd3 /src/rpcmining.cpp | |
| parent | 11d486d23f6f718a36f9bb5c3c7476e33b43f136 (diff) | |
| parent | 6fd546dd9680fff2c442075e511875acbd18b486 (diff) | |
Merge pull request #4802
6fd546d Remove CChainParams::NetworkID() (jtimon)
cc97210 Add fTestnetToBeDeprecatedFieldRPC to CChainParams (jtimon)
e11712d Move checkpoint data selection to chainparams (jtimon)
6de50c3 qt: add network-specific style object (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 e794bf69e0..c767835a27 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -239,7 +239,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() == CBaseChainParams::TESTNET)); + obj.push_back(Pair("testnet", Params().TestnetToBeDeprecatedFieldRPC())); obj.push_back(Pair("chain", Params().NetworkIDString())); #ifdef ENABLE_WALLET obj.push_back(Pair("generate", getgenerate(params, false))); |