diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-11-30 00:16:55 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-11-30 00:16:58 +0200 |
| commit | 83b412f4718506e8c9429b83e3826052a8942f6f (patch) | |
| tree | fbd3650feaad57ccac30461545224d6affd88bfd /src/daemon/rpc_command_executor.cpp | |
| parent | Merge pull request #502 (diff) | |
| parent | rpc: pass current block target in rpc (diff) | |
| download | monero-83b412f4718506e8c9429b83e3826052a8942f6f.tar.xz | |
Merge pull request #503
55e5a33 rpc: pass current block target in rpc (moneromooo-monero)
Diffstat (limited to 'src/daemon/rpc_command_executor.cpp')
| -rw-r--r-- | src/daemon/rpc_command_executor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/daemon/rpc_command_executor.cpp b/src/daemon/rpc_command_executor.cpp index 547db1672..74dbc0012 100644 --- a/src/daemon/rpc_command_executor.cpp +++ b/src/daemon/rpc_command_executor.cpp @@ -242,7 +242,7 @@ bool t_rpc_command_executor::show_difficulty() { tools::success_msg_writer() << "BH: " << res.height << ", DIFF: " << res.difficulty - << ", HR: " << (int) res.difficulty / 60L << " H/s"; + << ", HR: " << (int) res.difficulty / res.target << " H/s"; return true; } @@ -287,7 +287,7 @@ bool t_rpc_command_executor::show_status() { % (100.0f * ires.height / (ires.target_height ? ires.target_height < ires.height ? ires.height : ires.target_height : ires.height)) % (ires.testnet ? "testnet" : "mainnet") % [&ires]()->std::string { - float hr = ires.difficulty / 60.0f; + float hr = ires.difficulty / ires.target; if (hr>1e9) return (boost::format("%.2f GH/s") % (hr/1e9)).str(); if (hr>1e6) return (boost::format("%.2f MH/s") % (hr/1e6)).str(); if (hr>1e3) return (boost::format("%.2f kH/s") % (hr/1e3)).str(); |