Merge 38b2a0a3f9 into merged_master (Bitcoin PR bitcoin/bitcoin#23173)

This commit is contained in:
Byron Hambly 2023-05-24 10:56:16 +00:00
commit 2da8f66309
13 changed files with 56 additions and 36 deletions

View file

@ -37,8 +37,7 @@ BOOST_FIXTURE_TEST_CASE(tx_mempool_block_doublespend, Dersig100Setup)
const auto ToMemPool = [this](const CMutableTransaction& tx) {
LOCK(cs_main);
const MempoolAcceptResult result = AcceptToMemoryPool(m_node.chainman->ActiveChainstate(), *m_node.mempool, MakeTransactionRef(tx),
true /* bypass_limits */);
const MempoolAcceptResult result = m_node.chainman->ProcessTransaction(MakeTransactionRef(tx));
return result.m_result_type == MempoolAcceptResult::ResultType::VALID;
};