mempool: Remove txiter/setEntries from public interface

sedited · sedited · commit fe8c85e2eb93 · 2023-11-24T18:36:30.000+01:00
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -31,6 +31,8 @@
 #include <string_view>
 #include <utility>
 
+using setEntries = std::set<CTxMemPool::txiter, CompareIteratorByHash>;
+
 bool TestLockPointValidity(CChain& active_chain, const LockPoints& lp)
 {
     AssertLockHeld(cs_main);
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -394,8 +394,6 @@ class CTxMemPool
     using txiter = indexed_transaction_set::nth_index<0>::type::const_iterator;
     std::vector<CTransactionRef> txns_randomized GUARDED_BY(cs); //!< All transactions in mapTx, in random order
 
-    typedef std::set<txiter, CompareIteratorByHash> setEntries;
-
     typedef std::set<CTxMemPoolEntryRef, CompareIteratorByHash> setEntryRefs;
 
     using Limits = kernel::MemPoolLimits;
@@ -434,6 +432,9 @@ class CTxMemPool
                                                               const Limits& limits
                                                               ) const EXCLUSIVE_LOCKS_REQUIRED(cs);
 
+    /** Returns an iterator to the given hash, if found */
+    std::optional<txiter> GetIter(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs);
+
 public:
     indirectmap<COutPoint, const CTransaction*> mapNextTx GUARDED_BY(cs);
     std::map<uint256, CAmount> mapDeltas GUARDED_BY(cs);
@@ -522,9 +523,6 @@ class CTxMemPool
     /** Get the transaction in the pool that spends the same prevout */
     const CTransaction* GetConflictTx(const COutPoint& prevout) const EXCLUSIVE_LOCKS_REQUIRED(cs);
 
-    /** Returns an iterator to the given hash, if found */
-    std::optional<txiter> GetIter(const uint256& txid) const EXCLUSIVE_LOCKS_REQUIRED(cs);
-
     /** Translate a set of hashes into a set of pool entries to avoid repeated lookups.
      * Does not require that all of the hashes correspond to actual transactions in the mempool,
      * only returns the ones that exist. */
@@ -688,11 +686,6 @@ class CTxMemPool
     const CTxMemPoolEntry* GetEntry(const Txid& txid) const LIFETIMEBOUND EXCLUSIVE_LOCKS_REQUIRED(cs);
 
     CTransactionRef get(const uint256& hash) const;
-    txiter get_iter_from_wtxid(const uint256& wtxid) const EXCLUSIVE_LOCKS_REQUIRED(cs)
-    {
-        AssertLockHeld(cs);
-        return mapTx.project<0>(mapTx.get<index_by_wtxid>().find(wtxid));
-    }
     TxMempoolInfo info(const GenTxid& gtxid) const;
 
     /** Returns info for a transaction if its entry_sequence < last_sequence */
@@ -790,6 +783,12 @@ class CTxMemPool
      */
     void removeUnchecked(txiter entry, MemPoolRemovalReason reason) EXCLUSIVE_LOCKS_REQUIRED(cs);
 
+    txiter get_iter_from_wtxid(const uint256& wtxid) const EXCLUSIVE_LOCKS_REQUIRED(cs)
+    {
+        AssertLockHeld(cs);
+        return mapTx.project<0>(mapTx.get<index_by_wtxid>().find(wtxid));
+    }
+
     /** visited marks a CTxMemPoolEntry as having been traversed
      * during the lifetime of the most recently created Epoch::Guard
      * and returns false if we are the first visitor, true otherwise.

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`#include <string_view>`
`32`	`32`	`#include <utility>`
`33`	`33`
	`34`	`+using setEntries = std::set<CTxMemPool::txiter, CompareIteratorByHash>;`
	`35`	`+`
`34`	`36`	`bool TestLockPointValidity(CChain& active_chain, const LockPoints& lp)`
`35`	`37`	`{`
`36`	`38`	`AssertLockHeld(cs_main);`