Skip to content

Commit

Permalink
CTxMemPool::removeForBlock now uses RemoveStaged
Browse files Browse the repository at this point in the history
  • Loading branch information
sdaftuar committed Mar 14, 2016
1 parent 0735c0c commit 7659438
Showing 1 changed file with 6 additions and 2 deletions.
8 changes: 6 additions & 2 deletions src/txmempool.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down

0 comments on commit 7659438

Please sign in to comment.