diff options
| author | Riccardo Spagni <ric@spagni.net> | 2019-04-16 22:37:02 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2019-04-16 22:37:02 +0200 |
| commit | 0d2aaac15b37d0dfcfd59af23d127ff6f3e3b2b2 (patch) | |
| tree | 757cbbc62f421f8ae2d17caa93dd21791c2782fd /src/cryptonote_core | |
| parent | Merge pull request #5412 (diff) | |
| parent | unit_tests/long_term_block_weight: some tweaks that seem to make more sense (diff) | |
| download | monero-0d2aaac15b37d0dfcfd59af23d127ff6f3e3b2b2.tar.xz | |
Merge pull request #5414
e9fac29a unit_tests/long_term_block_weight: some tweaks that seem to make more sense (stoffu)
467f4c7e tests/block_weight: use integer division when computing median (stoffu)
815d08dc tests/block_weight: remove unused MULTIPLIER_SMALL (stoffu)
661f1fb8 blockchain: remove unused calc of short_term_constraint (stoffu)
Diffstat (limited to 'src/cryptonote_core')
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index 670f77d9d..51fd9fe16 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -3986,7 +3986,6 @@ bool Blockchain::update_next_cumulative_weight_limit(uint64_t *long_term_effecti new_weights[0] = long_term_block_weight; long_term_median = epee::misc_utils::median(new_weights); m_long_term_effective_median_block_weight = std::max<uint64_t>(CRYPTONOTE_BLOCK_GRANTED_FULL_REWARD_ZONE_V5, long_term_median); - short_term_constraint = m_long_term_effective_median_block_weight + m_long_term_effective_median_block_weight * 2 / 5; weights.clear(); get_last_n_blocks_weights(weights, CRYPTONOTE_REWARD_BLOCKS_WINDOW); |