aboutsummaryrefslogtreecommitdiff
path: root/src/rpcmining.cpp
diff options
context:
space:
mode:
authorjtimon <jtimon@blockstream.io>2014-10-10 11:19:36 +0200
committerjtimon <jtimon@jtimon.cc>2015-01-04 21:04:55 +0100
commit0cc0d8d60b8aec483a926a94aa7f85b9b0d0aca3 (patch)
tree3b60894705a098855587ca51582f183fe8711ab2 /src/rpcmining.cpp
parent41cced21063a89992ef393dda4fffc44ff60c7c3 (diff)
downloadbitcoin-0cc0d8d60b8aec483a926a94aa7f85b9b0d0aca3.tar.xz
Get rid of the internal miner's hashmeter
Diffstat (limited to 'src/rpcmining.cpp')
-rw-r--r--src/rpcmining.cpp20
1 files changed, 0 insertions, 20 deletions
diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp
index 45899d3db5..fd66fc78be 100644
--- a/src/rpcmining.cpp
+++ b/src/rpcmining.cpp
@@ -201,24 +201,6 @@ Value setgenerate(const Array& params, bool fHelp)
return Value::null;
}
-Value gethashespersec(const Array& params, bool fHelp)
-{
- if (fHelp || params.size() != 0)
- throw runtime_error(
- "gethashespersec\n"
- "\nReturns a recent hashes per second performance measurement while generating.\n"
- "See the getgenerate and setgenerate calls to turn generation on and off.\n"
- "\nResult:\n"
- "n (numeric) The recent hashes per second when generation is on (will return 0 if generation is off)\n"
- "\nExamples:\n"
- + HelpExampleCli("gethashespersec", "")
- + HelpExampleRpc("gethashespersec", "")
- );
-
- if (GetTimeMillis() - nHPSTimerStart > 8000)
- return (int64_t)0;
- return (int64_t)dHashesPerSec;
-}
#endif
@@ -237,7 +219,6 @@ Value getmininginfo(const Array& params, bool fHelp)
" \"errors\": \"...\" (string) Current errors\n"
" \"generate\": true|false (boolean) If the generation is on or off (see getgenerate or setgenerate calls)\n"
" \"genproclimit\": n (numeric) The processor limit for generation. -1 if no generation. (see getgenerate or setgenerate calls)\n"
- " \"hashespersec\": n (numeric) The hashes per second of the generation, or 0 if no generation.\n"
" \"pooledtx\": n (numeric) The size of the mem pool\n"
" \"testnet\": true|false (boolean) If using testnet or not\n"
" \"chain\": \"xxxx\", (string) current network name as defined in BIP70 (main, test, regtest)\n"
@@ -260,7 +241,6 @@ Value getmininginfo(const Array& params, bool fHelp)
obj.push_back(Pair("chain", Params().NetworkIDString()));
#ifdef ENABLE_WALLET
obj.push_back(Pair("generate", getgenerate(params, false)));
- obj.push_back(Pair("hashespersec", gethashespersec(params, false)));
#endif
return obj;
}