diff options
| author | Suhas Daftuar <sdaftuar@gmail.com> | 2015-10-19 12:42:42 -0400 |
|---|---|---|
| committer | Suhas Daftuar <sdaftuar@gmail.com> | 2016-03-14 12:11:08 -0400 |
| commit | 7659438a63ef162b4a4f942f86683ae6785f8162 (patch) | |
| tree | fc4ac8f84465ca93ae84af4a3bdac2debd277dde /src/txmempool.cpp | |
| parent | 0735c0ca7c22ce6529643ff0063c4188a901d75f (diff) | |
| download | bitcoin-7659438a63ef162b4a4f942f86683ae6785f8162.tar.xz | |
CTxMemPool::removeForBlock now uses RemoveStaged
Diffstat (limited to 'src/txmempool.cpp')
| -rw-r--r-- | src/txmempool.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index eee6cbf855..01f6c97aea 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -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()); } |