merge bitcoin#24625: Replace struct update_fee_delta with lambda

kwvg · kwvg · commit 4630c548a996 · 2025-06-19T10:50:33.000Z
diff --git a/src/node/miner.h b/src/node/miner.h
@@ -64,7 +64,7 @@ struct CTxMemPoolModifiedEntry {
         nSigOpCountWithAncestors = entry->GetSigOpCountWithAncestors();
     }
 
-    int64_t GetModifiedFee() const { return iter->GetModifiedFee(); }
+    CAmount GetModifiedFee() const { return iter->GetModifiedFee(); }
     uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; }
     CAmount GetModFeesWithAncestors() const { return nModFeesWithAncestors; }
     size_t GetTxSize() const { return iter->GetTxSize(); }
diff --git a/src/txmempool.cpp b/src/txmempool.cpp
@@ -31,16 +31,6 @@
 #include <optional>
 #include <ranges>
 
-struct update_fee_delta
-{
-    explicit update_fee_delta(int64_t _feeDelta) : feeDelta(_feeDelta) { }
-
-    void operator() (CTxMemPoolEntry &e) { e.UpdateModifiedFee(feeDelta); }
-
-private:
-    int64_t feeDelta;
-};
-
 bool TestLockPointValidity(CChain& active_chain, const LockPoints& lp)
 {
     AssertLockHeld(cs_main);
@@ -77,11 +67,11 @@ CTxMemPoolEntry::CTxMemPoolEntry(const CTransactionRef& tx, CAmount fee,
       nModFeesWithAncestors{nFee},
       nSigOpCountWithAncestors{sigOpCount} {}
 
-void CTxMemPoolEntry::UpdateModifiedFee(int64_t fee_diff)
+void CTxMemPoolEntry::UpdateModifiedFee(CAmount newFeeDelta)
 {
-    nModFeesWithDescendants = SaturatingAdd(nModFeesWithDescendants, fee_diff);
-    nModFeesWithAncestors = SaturatingAdd(nModFeesWithAncestors, fee_diff);
-    m_modified_fee = SaturatingAdd(m_modified_fee, fee_diff);
+    nModFeesWithDescendants = SaturatingAdd(nModFeesWithDescendants, newFeeDelta);
+    nModFeesWithAncestors = SaturatingAdd(nModFeesWithAncestors, newFeeDelta);
+    m_modified_fee = SaturatingAdd(m_modified_fee, newFeeDelta);
 }
 
 void CTxMemPoolEntry::UpdateLockPoints(const LockPoints& lp)
@@ -485,7 +475,7 @@ void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAnces
     // The following call to UpdateModifiedFee assumes no previous fee modifications
     Assume(entry.GetFee() == entry.GetModifiedFee());
     if (delta) {
-            mapTx.modify(newit, update_fee_delta(delta));
+        mapTx.modify(newit, [&delta](CTxMemPoolEntry& e) { e.UpdateModifiedFee(delta); });
     }
 
     // Update cachedInnerUsage to include contained transaction's usage.
@@ -1449,7 +1439,7 @@ void CTxMemPool::PrioritiseTransaction(const uint256& hash, const CAmount& nFeeD
         delta = SaturatingAdd(delta, nFeeDelta);
         txiter it = mapTx.find(hash);
         if (it != mapTx.end()) {
-            mapTx.modify(it, update_fee_delta(nFeeDelta));
+            mapTx.modify(it, [&nFeeDelta](CTxMemPoolEntry& e) { e.UpdateModifiedFee(nFeeDelta); });
             // Now update all ancestors' modified fees with descendants
             setEntries setAncestors;
             uint64_t nNoLimit = std::numeric_limits<uint64_t>::max();
diff --git a/src/txmempool.h b/src/txmempool.h
@@ -114,7 +114,7 @@ class CTxMemPoolEntry
     const unsigned int entryHeight; //!< Chain height when entering the mempool
     const bool spendsCoinbase;      //!< keep track of transactions that spend a coinbase
     const int64_t sigOpCount;       //!< Legacy sig ops plus P2SH sig op count
-    int64_t m_modified_fee;         //!< Used for determining the priority of the transaction for mining in a block
+    CAmount m_modified_fee;         //!< Used for determining the priority of the transaction for mining in a block
     LockPoints lockPoints;          //!< Track the height and time at which tx was final
 
     // Information about descendants of this transaction that are in the
@@ -143,7 +143,7 @@ class CTxMemPoolEntry
     std::chrono::seconds GetTime() const { return std::chrono::seconds{nTime}; }
     unsigned int GetHeight() const { return entryHeight; }
     int64_t GetSigOpCount() const { return sigOpCount; }
-    int64_t GetModifiedFee() const { return m_modified_fee; }
+    CAmount GetModifiedFee() const { return m_modified_fee; }
     size_t DynamicMemoryUsage() const { return nUsageSize; }
     const LockPoints& GetLockPoints() const { return lockPoints; }
 
@@ -152,7 +152,7 @@ class CTxMemPoolEntry
     // Adjusts the ancestor state
     void UpdateAncestorState(int64_t modifySize, CAmount modifyFee, int64_t modifyCount, int64_t modifySigOps);
     // Updates the modified fees with descendants/ancestors.
-    void UpdateModifiedFee(int64_t fee_diff);
+    void UpdateModifiedFee(CAmount newFeeDelta);
     // Update the LockPoints after a reorg
     void UpdateLockPoints(const LockPoints& lp);
 

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ struct CTxMemPoolModifiedEntry {`
`64`	`64`	`nSigOpCountWithAncestors = entry->GetSigOpCountWithAncestors();`
`65`	`65`	`}`
`66`	`66`
`67`		`- int64_t GetModifiedFee() const { return iter->GetModifiedFee(); }`
	`67`	`+ CAmount GetModifiedFee() const { return iter->GetModifiedFee(); }`
`68`	`68`	`uint64_t GetSizeWithAncestors() const { return nSizeWithAncestors; }`
`69`	`69`	`CAmount GetModFeesWithAncestors() const { return nModFeesWithAncestors; }`
`70`	`70`	`size_t GetTxSize() const { return iter->GetTxSize(); }`