Skip to content

Commit 3704433

Browse files
committed
scripted-diff: Invoke ::AcceptToMemoryPool with chainstate
-BEGIN VERIFY SCRIPT- find_regex='\bAcceptToMemoryPool\(' \ && git grep -l -E "$find_regex" -- src \ | grep -v '^src/validation\.\(cpp\|h\)$' \ | xargs sed -i -E 's@'"$find_regex"'@\0::ChainstateActive(), @g' -END VERIFY SCRIPT-
1 parent 229bc37 commit 3704433

9 files changed

+11
-11
lines changed

src/bench/block_assemble.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ static void AssembleBlock(benchmark::Bench& bench)
4848
LOCK(::cs_main); // Required for ::AcceptToMemoryPool.
4949

5050
for (const auto& txr : txs) {
51-
const MempoolAcceptResult res = ::AcceptToMemoryPool(*test_setup.m_node.mempool, txr, false /* bypass_limits */);
51+
const MempoolAcceptResult res = ::AcceptToMemoryPool(::ChainstateActive(), *test_setup.m_node.mempool, txr, false /* bypass_limits */);
5252
assert(res.m_result_type == MempoolAcceptResult::ResultType::VALID);
5353
}
5454
}

src/net_processing.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2236,7 +2236,7 @@ void PeerManagerImpl::ProcessOrphanTx(std::set<uint256>& orphan_work_set)
22362236
if (orphan_it == mapOrphanTransactions.end()) continue;
22372237

22382238
const CTransactionRef porphanTx = orphan_it->second.tx;
2239-
const MempoolAcceptResult result = AcceptToMemoryPool(m_mempool, porphanTx, false /* bypass_limits */);
2239+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), m_mempool, porphanTx, false /* bypass_limits */);
22402240
const TxValidationState& state = result.m_state;
22412241

22422242
if (result.m_result_type == MempoolAcceptResult::ResultType::VALID) {
@@ -3258,7 +3258,7 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type,
32583258
return;
32593259
}
32603260

3261-
const MempoolAcceptResult result = AcceptToMemoryPool(m_mempool, ptx, false /* bypass_limits */);
3261+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), m_mempool, ptx, false /* bypass_limits */);
32623262
const TxValidationState& state = result.m_state;
32633263

32643264
if (result.m_result_type == MempoolAcceptResult::ResultType::VALID) {

src/node/transaction.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t
5353
if (max_tx_fee > 0) {
5454
// First, call ATMP with test_accept and check the fee. If ATMP
5555
// fails here, return error immediately.
56-
const MempoolAcceptResult result = AcceptToMemoryPool(*node.mempool, tx, false /* bypass_limits */,
56+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), *node.mempool, tx, false /* bypass_limits */,
5757
true /* test_accept */);
5858
if (result.m_result_type != MempoolAcceptResult::ResultType::VALID) {
5959
return HandleATMPError(result.m_state, err_string);
@@ -62,7 +62,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t
6262
}
6363
}
6464
// Try to submit the transaction to the mempool.
65-
const MempoolAcceptResult result = AcceptToMemoryPool(*node.mempool, tx, false /* bypass_limits */,
65+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), *node.mempool, tx, false /* bypass_limits */,
6666
false /* test_accept */);
6767
if (result.m_result_type != MempoolAcceptResult::ResultType::VALID) {
6868
return HandleATMPError(result.m_state, err_string);

src/rpc/rawtransaction.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -946,7 +946,7 @@ static RPCHelpMan testmempoolaccept()
946946
result_0.pushKV("txid", tx->GetHash().GetHex());
947947
result_0.pushKV("wtxid", tx->GetWitnessHash().GetHex());
948948

949-
const MempoolAcceptResult accept_result = WITH_LOCK(cs_main, return AcceptToMemoryPool(mempool, std::move(tx),
949+
const MempoolAcceptResult accept_result = WITH_LOCK(cs_main, return AcceptToMemoryPool(::ChainstateActive(), mempool, std::move(tx),
950950
false /* bypass_limits */, /* test_accept */ true));
951951

952952
// Only return the fee and vsize if the transaction would pass ATMP.

src/test/txvalidation_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ BOOST_FIXTURE_TEST_CASE(tx_mempool_reject_coinbase, TestChain100Setup)
3333
LOCK(cs_main);
3434

3535
unsigned int initialPoolSize = m_node.mempool->size();
36-
const MempoolAcceptResult result = AcceptToMemoryPool(*m_node.mempool, MakeTransactionRef(coinbaseTx),
36+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), *m_node.mempool, MakeTransactionRef(coinbaseTx),
3737
true /* bypass_limits */);
3838

3939
BOOST_CHECK(result.m_result_type == MempoolAcceptResult::ResultType::INVALID);

src/test/txvalidationcache_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, TestChain100Setup)
2828
const auto ToMemPool = [this](const CMutableTransaction& tx) {
2929
LOCK(cs_main);
3030

31-
const MempoolAcceptResult result = AcceptToMemoryPool(*m_node.mempool, MakeTransactionRef(tx),
31+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), *m_node.mempool, MakeTransactionRef(tx),
3232
true /* bypass_limits */);
3333
return result.m_result_type == MempoolAcceptResult::ResultType::VALID;
3434
};

src/test/util/setup_common.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ CMutableTransaction TestChain100Setup::CreateValidMempoolTransaction(CTransactio
303303
// Add transaction to the mempool
304304
{
305305
LOCK(cs_main);
306-
const MempoolAcceptResult result = AcceptToMemoryPool(*m_node.mempool.get(), MakeTransactionRef(mempool_txn), /* bypass_limits */ false);
306+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), *m_node.mempool.get(), MakeTransactionRef(mempool_txn), /* bypass_limits */ false);
307307
assert(result.m_result_type == MempoolAcceptResult::ResultType::VALID);
308308
}
309309

src/test/validation_block_tests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ BOOST_AUTO_TEST_CASE(mempool_locks_reorg)
284284
{
285285
LOCK(cs_main);
286286
for (const auto& tx : txs) {
287-
const MempoolAcceptResult result = AcceptToMemoryPool(*m_node.mempool, tx, false /* bypass_limits */);
287+
const MempoolAcceptResult result = AcceptToMemoryPool(::ChainstateActive(), *m_node.mempool, tx, false /* bypass_limits */);
288288
BOOST_REQUIRE(result.m_result_type == MempoolAcceptResult::ResultType::VALID);
289289
}
290290
}

src/txmempool.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,7 @@ void CTxMemPool::AddTransactionsUpdated(unsigned int n)
356356
void CTxMemPool::addUnchecked(const CTxMemPoolEntry &entry, setEntries &setAncestors, bool validFeeEstimate)
357357
{
358358
// Add to memory pool without checking anything.
359-
// Used by AcceptToMemoryPool(), which DOES do
359+
// Used by AcceptToMemoryPool(::ChainstateActive(), ), which DOES do
360360
// all the appropriate checks.
361361
indexed_transaction_set::iterator newit = mapTx.insert(entry).first;
362362

0 commit comments

Comments
 (0)