highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-21 14:22:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Replace struct update_lock_points with lambda

Browse Source 
No behavior change.
This code was introduced in 5add7a7 before we required C++11, which is
why the struct was needed. As we are now using more modern C++ and this
is the only place where lockpoints are updated for mempool entries, it
is more idiomatic to call `modify` with a lambda.

Co-authored-by: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
This commit is contained in:
glozow 2022-01-17 10:24:38 +00:00
parent c7cd98c717
commit e177fcab38
2 changed files with 1 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/txmempool.h
View File

@ -312,16 +312,6 @@ public:
} }
}; };
struct update_lock_points
{
explicit update_lock_points(const LockPoints& _lp) : lp(_lp) { }
void operator() (CTxMemPoolEntry &e) { e.UpdateLockPoints(lp); }
private:
const LockPoints& lp;
};
// Multi_index tag names // Multi_index tag names
struct descendant_score {}; struct descendant_score {};
struct entry_time {}; struct entry_time {};

2
src/validation.cpp
View File

@ -375,7 +375,7 @@ void CChainState::MaybeUpdateMempoolForReorg(
} else if (!validLP) { } else if (!validLP) {
// If CheckSequenceLocks succeeded, it also updated the LockPoints. // If CheckSequenceLocks succeeded, it also updated the LockPoints.
// Now update the mempool entry lockpoints as well. // Now update the mempool entry lockpoints as well.
m_mempool->mapTx.modify(it, update_lock_points(lp)); m_mempool->mapTx.modify(it, [&lp](CTxMemPoolEntry& e) { e.UpdateLockPoints(lp); });
} }
// If the transaction spends any coinbase outputs, it must be mature. // If the transaction spends any coinbase outputs, it must be mature.