highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-09-28 23:03:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace struct update_fee_delta with lambda

Browse Source
This commit is contained in:
MarcoFalke
2022-03-21 11:37:17 +01:00
parent 6c72f3192a
commit fa8857c3f7
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/txmempool.cpp
View File

@@ -54,16 +54,6 @@ struct update_ancestor_state
int64_t modifySigOpsCost; int64_t modifySigOpsCost;
}; };
struct update_fee_delta
{
explicit update_fee_delta(int64_t _feeDelta) : feeDelta(_feeDelta) { }
void operator() (CTxMemPoolEntry &e) { e.UpdateFeeDelta(feeDelta); }
private:
int64_t feeDelta;
};
bool TestLockPointValidity(CChain& active_chain, const LockPoints& lp) bool TestLockPointValidity(CChain& active_chain, const LockPoints& lp)
{ {
AssertLockHeld(cs_main); AssertLockHeld(cs_main);
@@ -496,7 +486,7 @@ void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAnces
CAmount delta{0}; CAmount delta{0};
ApplyDelta(entry.GetTx().GetHash(), delta); ApplyDelta(entry.GetTx().GetHash(), delta);
if (delta) { if (delta) {
mapTx.modify(newit, update_fee_delta(delta)); mapTx.modify(newit, [&delta](CTxMemPoolEntry& e) { e.UpdateFeeDelta(delta); });
} }
// Update cachedInnerUsage to include contained transaction's usage. // Update cachedInnerUsage to include contained transaction's usage.
@@ -931,7 +921,7 @@ void CTxMemPool::PrioritiseTransaction(const uint256& hash, const CAmount& nFeeD
delta += nFeeDelta; delta += nFeeDelta;
txiter it = mapTx.find(hash); txiter it = mapTx.find(hash);
if (it != mapTx.end()) { if (it != mapTx.end()) {
mapTx.modify(it, update_fee_delta(delta)); mapTx.modify(it, [&delta](CTxMemPoolEntry& e) { e.UpdateFeeDelta(delta); });
// Now update all ancestors' modified fees with descendants // Now update all ancestors' modified fees with descendants
setEntries setAncestors; setEntries setAncestors;
uint64_t nNoLimit = std::numeric_limits<uint64_t>::max(); uint64_t nNoLimit = std::numeric_limits<uint64_t>::max();