ATMP et al would often use map iterator implementation details such as end() or find(), which is acceptable in current code.
However, this not only makes it impossible to turn the maps into private members in the future but also makes it harder to replace the maps with different data structures.
This is required for and split off of #13804
375- const CAmount &delta = pos->second;
376- if (delta) {
377+ CAmount delta{0};
378+ ApplyDelta(hash, delta);
379+ if (delta) {
380 mapTx.modify(newit, update_fee_delta(delta));
394@@ -397,11 +395,8 @@ void CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
395 // to clean up the mess we're leaving here.
396
397 // Update ancestors with information about this tx
398- for (const uint256 &phash : setParentTransactions) {
399- txiter pit = mapTx.find(phash);
400- if (pit != mapTx.end()) {
401+ for (const auto& pit : GetSetIter(setParentTransactions)) {
402 UpdateParent(newit, pit, true);
394@@ -397,11 +395,8 @@ void CTxMemPool::addUnchecked(const uint256& hash, const CTxMemPoolEntry &entry,
395 // to clean up the mess we're leaving here.
396
397 // Update ancestors with information about this tx
398- for (const uint256 &phash : setParentTransactions) {
399- txiter pit = mapTx.find(phash);
400- if (pit != mapTx.end()) {
401+ for (const auto& pit : GetSetIter(setParentTransactions)) {
txiter instead of auto?
564@@ -565,7 +565,12 @@ class CTxMemPool
565 void ApplyDelta(const uint256 hash, CAmount &nFeeDelta) const;
566 void ClearPrioritisation(const uint256 hash);
567
568-public:
569+ /** Get the transaction in the pool that spends the same prevout */
570+ const CTransaction* GetConflictTx(const COutPoint& prevout) const EXCLUSIVE_LOCKS_REQUIRED(cs);
571+
572+ /** Translate a set of hashes into a set of pool iterators to avoid repeated lookups */
573+ setEntries GetSetIter(const std::set<uint256>& hashes) const EXCLUSIVE_LOCKS_REQUIRED(cs);
GetIterSet?
GetIterSet according to your feedback
601@@ -602,10 +602,8 @@ static bool AcceptToMemoryPoolWorker(const CChainParams& chainparams, CTxMemPool
602 std::set<uint256> setConflicts;
603 for (const CTxIn &txin : tx.vin)
604 {
605- auto itConflicting = pool.mapNextTx.find(txin.prevout);
606- if (itConflicting != pool.mapNextTx.end())
607- {
608- const CTransaction *ptxConflicting = itConflicting->second;
609+ const CTransaction* ptxConflicting = pool.GetConflictTx(txin.prevout);
snake_case.
itConflicting to ptxConflicting, but ptxConflicting existed already. My bad.
876+ return it == mapNextTx.end() ? nullptr : it->second;
877+}
878+
879+CTxMemPool::setEntries CTxMemPool::GetIterSet(const std::set<uint256>& hashes) const
880+{
881+ CTxMemPool::setEntries ret;
