Merge #8220: Stop trimming when mapTx is empty

ad0752e Stop trimming when mapTx is empty (Pieter Wuille)
This commit is contained in:
Wladimir J. van der Laan 2016-06-20 15:21:21 +02:00 committed by Alexander Block
parent 36aa554584
commit c2dabf8bd8

View File

@ -1219,7 +1219,7 @@ void CTxMemPool::TrimToSize(size_t sizelimit, std::vector<COutPoint>* pvNoSpends
unsigned nTxnRemoved = 0; unsigned nTxnRemoved = 0;
CFeeRate maxFeeRateRemoved(0); CFeeRate maxFeeRateRemoved(0);
while (DynamicMemoryUsage() > sizelimit) { while (!mapTx.empty() && DynamicMemoryUsage() > sizelimit) {
indexed_transaction_set::index<descendant_score>::type::iterator it = mapTx.get<descendant_score>().begin(); indexed_transaction_set::index<descendant_score>::type::iterator it = mapTx.get<descendant_score>().begin();
// We set the new mempool min fee to the feerate of the removed set, plus the // We set the new mempool min fee to the feerate of the removed set, plus the