diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-09-01 12:22:21 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2020-09-01 12:34:29 +0300 |
| commit | 7140b31b90cbd84d75eedb3e395d0d55f83b5b95 (patch) | |
| tree | 1407b7a46bbf4b96dcbefa34533971bac7df322b /src | |
| parent | 66e47e5e506043fbb9b4e487b44bf992985709c9 (diff) | |
refactor: CTxMemPool::ApplyDelta() requires CTxMemPool::cs lock
No change in behavior, the lock is already held at call sites.
Also `const uint256` refactored to `const uint256&`.
Diffstat (limited to 'src')
| -rw-r--r-- | src/txmempool.cpp | 4 | ||||
| -rw-r--r-- | src/txmempool.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/txmempool.cpp b/src/txmempool.cpp index ea6d7e808c..00b1fb38f8 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -852,9 +852,9 @@ void CTxMemPool::PrioritiseTransaction(const uint256& hash, const CAmount& nFeeD LogPrintf("PrioritiseTransaction: %s feerate += %s\n", hash.ToString(), FormatMoney(nFeeDelta)); } -void CTxMemPool::ApplyDelta(const uint256 hash, CAmount &nFeeDelta) const +void CTxMemPool::ApplyDelta(const uint256& hash, CAmount &nFeeDelta) const { - LOCK(cs); + AssertLockHeld(cs); std::map<uint256, CAmount>::const_iterator pos = mapDeltas.find(hash); if (pos == mapDeltas.end()) return; diff --git a/src/txmempool.h b/src/txmempool.h index 05455b8bdd..46bcf85712 100644 --- a/src/txmempool.h +++ b/src/txmempool.h @@ -626,7 +626,7 @@ public: /** Affect CreateNewBlock prioritisation of transactions */ void PrioritiseTransaction(const uint256& hash, const CAmount& nFeeDelta); - void ApplyDelta(const uint256 hash, CAmount &nFeeDelta) const; + void ApplyDelta(const uint256& hash, CAmount &nFeeDelta) const EXCLUSIVE_LOCKS_REQUIRED(cs); void ClearPrioritisation(const uint256 hash); /** Get the transaction in the pool that spends the same prevout */ |