aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordoy-lee <doylet@protonmail.com>2018-10-22 14:02:44 +1100
committerdoy-lee <doylet@protonmail.com>2018-10-23 10:03:45 +1100
commit5a2e54a1cb184b4aeca68ce275f169a1f17e8614 (patch)
tree36b0b416b13b14804663b090a13e728ff614ae2c
parentMerge pull request #4610 (diff)
downloadmonero-5a2e54a1cb184b4aeca68ce275f169a1f17e8614.tar.xz
Fix prune using receive time as tx_weight
-rw-r--r--src/cryptonote_core/tx_pool.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_core/tx_pool.cpp b/src/cryptonote_core/tx_pool.cpp
index 5a9fcf67e..df41b13e2 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;
}