CTxMemPool::removeForBlock now uses RemoveStaged

furszy · furszy · commit c30fa16d4b2f · 2021-01-18T09:35:56.000-03:00
Coming from btc@7659438a63ef162b4a4f942f86683ae6785f8162
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -603,8 +603,12 @@ void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigne
             entries.push_back(*i);
     }
     for (const auto& tx : vtx) {
-        std::list<CTransactionRef> 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());
     }
