mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2024-11-20 10:38:42 +01:00
Code Issues Projects Releases Wiki Activity

CTxMemPool::removeForBlock now uses RemoveStaged

Browse Source
This commit is contained in:
Suhas Daftuar 2015-10-19 12:42:42 -04:00
parent 0735c0ca7c
commit 7659438a63
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/txmempool.cpp
View File

@ -564,8 +564,12 @@ void CTxMemPool::removeForBlock(const std::vector<CTransaction>& vtx, unsigned i
}
BOOST_FOREACH(const CTransaction& tx, vtx)
{
std::list<CTransaction> dummy;
remove(tx, dummy, false);
txiter it = mapTx.find(tx.GetHash());
if (it != mapTx.end()) {
setEntries stage;
stage.insert(it);
RemoveStaged(stage);
}
removeConflicts(tx, conflicts);
ClearPrioritisation(tx.GetHash());
}