diff options
author | Riccardo Spagni <ric@spagni.net> | 2018-11-04 20:45:06 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2018-11-04 20:45:06 +0200 |
commit | adf4eb8d5075fc72863c4710ba235794dc8ebdc8 (patch) | |
tree | eebff1bc4e5c3029f8627eba403d4d3adfac274b /src/cryptonote_core/tx_pool.cpp | |
parent | Merge pull request #4687 (diff) | |
parent | Fix prune using receive time as tx_weight (diff) | |
download | monero-adf4eb8d5075fc72863c4710ba235794dc8ebdc8.tar.xz |
Merge pull request #4688
5a2e54a1 Fix prune using receive time as tx_weight (doy-lee)
Diffstat (limited to 'src/cryptonote_core/tx_pool.cpp')
-rw-r--r-- | src/cryptonote_core/tx_pool.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp index 553a22298..70f7e8328 100644 --- a/src/cryptonote_core/tx_pool.cpp +++ b/src/cryptonote_core/tx_pool.cpp @@ -379,11 +379,11 @@ namespace cryptonote return; } // remove first, in case this throws, so key images aren't removed - MINFO("Pruning tx " << txid << " from txpool: weight: " << it->first.second << ", fee/byte: " << it->first.first); + MINFO("Pruning tx " << txid << " from txpool: weight: " << meta.weight << ", fee/byte: " << it->first.first); m_blockchain.remove_txpool_tx(txid); - m_txpool_weight -= it->first.second; + m_txpool_weight -= meta.weight; remove_transaction_keyimages(tx, txid); - MINFO("Pruned tx " << txid << " from txpool: weight: " << it->first.second << ", fee/byte: " << it->first.first); + MINFO("Pruned tx " << txid << " from txpool: weight: " << meta.weight << ", fee/byte: " << it->first.first); m_txs_by_fee_and_receive_time.erase(it--); changed = true; } |