From 09d18916afb0ecae90700d4befd9d5dc52767970 Mon Sep 17 00:00:00 2001 From: glozow Date: Wed, 29 Sep 2021 19:10:44 +0100 Subject: MOVEONLY: remove single-use helper func CheckInputsAndUpdateCoins --- src/txmempool.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'src/txmempool.cpp') diff --git a/src/txmempool.cpp b/src/txmempool.cpp index 2decc153f2..40e142dc47 100644 --- a/src/txmempool.cpp +++ b/src/txmempool.cpp @@ -671,15 +671,6 @@ void CTxMemPool::clear() _clear(); } -static void CheckInputsAndUpdateCoins(const CTransaction& tx, CCoinsViewCache& mempoolDuplicate, const int64_t spendheight) -{ - TxValidationState dummy_state; // Not used. CheckTxInputs() should always pass - CAmount txfee = 0; - bool fCheckResult = tx.IsCoinBase() || Consensus::CheckTxInputs(tx, dummy_state, mempoolDuplicate, spendheight, txfee); - assert(fCheckResult); - UpdateCoins(tx, mempoolDuplicate, std::numeric_limits::max()); -} - void CTxMemPool::check(CChainState& active_chainstate) const { if (m_check_ratio == 0) return; @@ -772,7 +763,11 @@ void CTxMemPool::check(CChainState& active_chainstate) const // just a sanity check, not definitive that this calc is correct... assert(it->GetSizeWithDescendants() >= child_sizes + it->GetTxSize()); - CheckInputsAndUpdateCoins(tx, mempoolDuplicate, spendheight); + TxValidationState dummy_state; // Not used. CheckTxInputs() should always pass + CAmount txfee = 0; + bool fCheckResult = tx.IsCoinBase() || Consensus::CheckTxInputs(tx, dummy_state, mempoolDuplicate, spendheight, txfee); + assert(fCheckResult); + UpdateCoins(tx, mempoolDuplicate, std::numeric_limits::max()); } for (auto it = mapNextTx.cbegin(); it != mapNextTx.cend(); it++) { uint256 hash = it->second->GetHash(); -- cgit v1.2.3