[mempool] move removed and conflicts transaction ref list to vector.

furszy · furszy · commit 9979f3d4deb7 · 2021-01-18T09:35:59.000-03:00
diff --git a/src/test/mempool_tests.cpp b/src/test/mempool_tests.cpp
@@ -53,7 +53,7 @@ BOOST_AUTO_TEST_CASE(MempoolRemoveTest)
 
 
     CTxMemPool testPool(CFeeRate(0));
-    std::list<CTransactionRef> removed;
+    std::vector<CTransactionRef> removed;
 
     // Nothing in pool, remove should do nothing:
     testPool.removeRecursive(txParent, &removed);
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -489,7 +489,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants
     }
 }
 
-void CTxMemPool::removeRecursive(const CTransaction& origTx, std::list<CTransactionRef>* removed)
+void CTxMemPool::removeRecursive(const CTransaction& origTx, std::vector<CTransactionRef>* removed)
 {
     // Remove transaction from memory pool
     {
@@ -580,7 +580,7 @@ void CTxMemPool::removeWithAnchor(const uint256& invalidRoot)
     }
 }
 
-void CTxMemPool::removeConflicts(const CTransaction& tx, std::list<CTransactionRef>* removed)
+void CTxMemPool::removeConflicts(const CTransaction& tx, std::vector<CTransactionRef>* removed)
 {
     // Remove transactions which depend on inputs of tx, recursively
     std::list<CTransaction> result;
@@ -612,7 +612,7 @@ void CTxMemPool::removeConflicts(const CTransaction& tx, std::list<CTransactionR
  * Called when a block is connected. Removes from mempool and updates the miner fee estimator.
  */
 void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                                std::list<CTransactionRef>* conflicts, bool fCurrentEstimate)
+                                std::vector<CTransactionRef>* conflicts, bool fCurrentEstimate)
 {
     LOCK(cs);
     std::vector<CTxMemPoolEntry> entries;
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -520,12 +520,12 @@ class CTxMemPool
     // then invoke the second version.
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry& entry, bool fCurrentEstimate = true);
     bool addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry, setEntries &setAncestors, bool fCurrentEstimate = true);
-    void removeRecursive(const CTransaction& tx, std::list<CTransactionRef>* removed = nullptr);
+    void removeRecursive(const CTransaction& tx, std::vector<CTransactionRef>* removed = nullptr);
     void removeForReorg(const CCoinsViewCache* pcoins, unsigned int nMemPoolHeight, int flags);
     void removeWithAnchor(const uint256& invalidRoot);
-    void removeConflicts(const CTransaction& tx, std::list<CTransactionRef>* removed = nullptr);
+    void removeConflicts(const CTransaction& tx, std::vector<CTransactionRef>* removed = nullptr);
     void removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,
-                        std::list<CTransactionRef>* conflicts = nullptr, bool fCurrentEstimate = true);
+                        std::vector<CTransactionRef>* conflicts = nullptr, bool fCurrentEstimate = true);
     void clear();
     void _clear();  // lock-free
     bool CompareDepthAndScore(const uint256& hasha, const uint256& hashb);
diff --git a/src/validation.cpp b/src/validation.cpp
@@ -2020,7 +2020,7 @@ static int64_t nTimePostConnect = 0;
  * applied to the UTXO state as a part of a single ActivateBestChainStep call.
  */
 struct ConnectTrace {
-    std::list<CTransactionRef> txConflicted;
+    std::vector<CTransactionRef> txConflicted;
     std::vector<std::pair<CBlockIndex*, std::shared_ptr<const CBlock> > > blocksConnected;
 };
 

Original file line number	Diff line number	Diff line change
`@@ -489,7 +489,7 @@ void CTxMemPool::CalculateDescendants(txiter entryit, setEntries &setDescendants`
`489`	`489`	`}`
`490`	`490`	`}`
`491`	`491`
`492`		`-void CTxMemPool::removeRecursive(const CTransaction& origTx, std::list<CTransactionRef>* removed)`
	`492`	`+void CTxMemPool::removeRecursive(const CTransaction& origTx, std::vector<CTransactionRef>* removed)`
`493`	`493`	`{`
`494`	`494`	`// Remove transaction from memory pool`
`495`	`495`	`{`
`@@ -580,7 +580,7 @@ void CTxMemPool::removeWithAnchor(const uint256& invalidRoot)`
`580`	`580`	`}`
`581`	`581`	`}`
`582`	`582`
`583`		`-void CTxMemPool::removeConflicts(const CTransaction& tx, std::list<CTransactionRef>* removed)`
	`583`	`+void CTxMemPool::removeConflicts(const CTransaction& tx, std::vector<CTransactionRef>* removed)`
`584`	`584`	`{`
`585`	`585`	`// Remove transactions which depend on inputs of tx, recursively`
`586`	`586`	`std::list<CTransaction> result;`
`@@ -612,7 +612,7 @@ void CTxMemPool::removeConflicts(const CTransaction& tx, std::list<CTransactionR`
`612`	`612`	`* Called when a block is connected. Removes from mempool and updates the miner fee estimator.`
`613`	`613`	`*/`
`614`	`614`	`void CTxMemPool::removeForBlock(const std::vector<CTransactionRef>& vtx, unsigned int nBlockHeight,`
`615`		`- std::list<CTransactionRef>* conflicts, bool fCurrentEstimate)`
	`615`	`+ std::vector<CTransactionRef>* conflicts, bool fCurrentEstimate)`
`616`	`616`	`{`
`617`	`617`	`LOCK(cs);`
`618`	`618`	`std::vector<CTxMemPoolEntry> entries;`