CTxMemPool::removeForBlock now uses RemoveStaged

sdaftuar · sdaftuar · commit 7659438a63ef · 2016-03-14T12:11:08.000-04:00
diff --git 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());
     }

Original file line number	Diff line number	Diff line change
`@@ -564,8 +564,12 @@ void CTxMemPool::removeForBlock(const std::vector<CTransaction>& vtx, unsigned i`
`564`	`564`	`}`
`565`	`565`	`BOOST_FOREACH(const CTransaction& tx, vtx)`
`566`	`566`	`{`
`567`		`- std::list<CTransaction> dummy;`
`568`		`- remove(tx, dummy, false);`
	`567`	`+ txiter it = mapTx.find(tx.GetHash());`
	`568`	`+ if (it != mapTx.end()) {`
	`569`	`+ setEntries stage;`
	`570`	`+ stage.insert(it);`
	`571`	`+ RemoveStaged(stage);`
	`572`	`+ }`
`569`	`573`	`removeConflicts(tx, conflicts);`
`570`	`574`	`ClearPrioritisation(tx.GetHash());`
`571`	`575`	`}`