Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2354 

aeb30c83 daemon: fix backlog estimating at max block size (moneromooo-monero)
This commit is contained in:
Riccardo Spagni 2017-08-26 23:33:55 +02:00
parent 8ee10e707b aeb30c8381
commit 19cdd10750
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/daemon/rpc_command_executor.cpp
View File

@ -963,13 +963,14 @@ bool t_rpc_command_executor::print_transaction_pool_stats() {
size_t avg_bytes = n_transactions ? res.pool_stats.bytes_total / n_transactions : 0; size_t avg_bytes = n_transactions ? res.pool_stats.bytes_total / n_transactions : 0;
std::string backlog_message; std::string backlog_message;
if (res.pool_stats.bytes_total <= ires.block_size_limit) const uint64_t full_reward_zone = ires.block_size_limit / 2;
if (res.pool_stats.bytes_total <= full_reward_zone)
{ {
backlog_message = "no backlog"; backlog_message = "no backlog";
} }
else else
{ {
uint64_t backlog = (res.pool_stats.bytes_total + ires.block_size_limit - 1) / ires.block_size_limit; uint64_t backlog = (res.pool_stats.bytes_total + full_reward_zone - 1) / full_reward_zone;
backlog_message = (boost::format("estimated %u block (%u minutes) backlog") % backlog % (backlog * DIFFICULTY_TARGET_V2 / 60)).str(); backlog_message = (boost::format("estimated %u block (%u minutes) backlog") % backlog % (backlog * DIFFICULTY_TARGET_V2 / 60)).str();
} }