aboutsummaryrefslogtreecommitdiff
path: root/src/rpcmining.cpp
diff options
context:
space:
mode:
authorWladimir J. van der Laan <[email protected]>2013-06-02 05:21:24 -0700
committerWladimir J. van der Laan <[email protected]>2013-06-02 05:21:24 -0700
commit50b4086a4a4fbba8241c4b8807870d7b44c109fe (patch)
treefe299488d21bae0e041e32319c1ff8c825f0d446 /src/rpcmining.cpp
parentMerge pull request #2721 from laanwj/2013_05_qt5 (diff)
parentremove GetBoolArg() fDefault parameter defaulting to false (diff)
downloaddiscoin-50b4086a4a4fbba8241c4b8807870d7b44c109fe.tar.xz
discoin-50b4086a4a4fbba8241c4b8807870d7b44c109fe.zip
Merge pull request #2588 from Diapolo/GetBoolArg
remove GetBoolArg() fDefault parameter defaulting to false
Diffstat (limited to 'src/rpcmining.cpp')
-rw-r--r--src/rpcmining.cpp22
1 files changed, 11 insertions, 11 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 845e7f1f9..d2cac6870 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -33,7 +33,7 @@ Value getgenerate(const Array& params, bool fHelp)
"getgenerate\n"
"Returns true or false.");
- return GetBoolArg("-gen");
+ return GetBoolArg("-gen", false);
}
@@ -84,16 +84,16 @@ Value getmininginfo(const Array& params, bool fHelp)
"Returns an object containing mining-related information.");
Object obj;
- obj.push_back(Pair("blocks", (int)nBestHeight));
- obj.push_back(Pair("currentblocksize",(uint64_t)nLastBlockSize));
- obj.push_back(Pair("currentblocktx",(uint64_t)nLastBlockTx));
- obj.push_back(Pair("difficulty", (double)GetDifficulty()));
- obj.push_back(Pair("errors", GetWarnings("statusbar")));
- obj.push_back(Pair("generate", GetBoolArg("-gen")));
- obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
- obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
- obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));
- obj.push_back(Pair("testnet", fTestNet));
+ obj.push_back(Pair("blocks", (int)nBestHeight));
+ obj.push_back(Pair("currentblocksize", (uint64_t)nLastBlockSize));
+ obj.push_back(Pair("currentblocktx", (uint64_t)nLastBlockTx));
+ obj.push_back(Pair("difficulty", (double)GetDifficulty()));
+ obj.push_back(Pair("errors", GetWarnings("statusbar")));
+ obj.push_back(Pair("generate", GetBoolArg("-gen", false)));
+ obj.push_back(Pair("genproclimit", (int)GetArg("-genproclimit", -1)));
+ obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
+ obj.push_back(Pair("pooledtx", (uint64_t)mempool.size()));
+ obj.push_back(Pair("testnet", fTestNet));
return obj;
}