diff options
| author | John Newbery <john@johnnewbery.com> | 2021-09-27 17:47:21 +0100 |
|---|---|---|
| committer | John Newbery <john@johnnewbery.com> | 2021-11-03 14:34:41 +0000 |
| commit | 2c64270bbe523ef87e7225c351464e7c716f0b3e (patch) | |
| tree | 9a19b873baba2b2ec407dcd9cace410c37fc49f7 /src/node | |
| parent | 92a3aeecf6a82e9cbc9fda11022b0548efd24d05 (diff) | |
| download | bitcoin-2c64270bbe523ef87e7225c351464e7c716f0b3e.tar.xz | |
[refactor] Don't call AcceptToMemoryPool() from outside validation.cpp
Diffstat (limited to 'src/node')
| -rw-r--r-- | src/node/transaction.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/node/transaction.cpp b/src/node/transaction.cpp index 2a7bcc057f..33b8e9351c 100644 --- a/src/node/transaction.cpp +++ b/src/node/transaction.cpp @@ -70,8 +70,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t if (max_tx_fee > 0) { // First, call ATMP with test_accept and check the fee. If ATMP // fails here, return error immediately. - const MempoolAcceptResult result = AcceptToMemoryPool(node.chainman->ActiveChainstate(), *node.mempool, tx, false /* bypass_limits */, - true /* test_accept */); + const MempoolAcceptResult result = node.chainman->ProcessTransaction(tx, /*test_accept=*/ true); if (result.m_result_type != MempoolAcceptResult::ResultType::VALID) { return HandleATMPError(result.m_state, err_string); } else if (result.m_base_fees.value() > max_tx_fee) { @@ -79,8 +78,7 @@ TransactionError BroadcastTransaction(NodeContext& node, const CTransactionRef t } } // Try to submit the transaction to the mempool. - const MempoolAcceptResult result = AcceptToMemoryPool(node.chainman->ActiveChainstate(), *node.mempool, tx, false /* bypass_limits */, - false /* test_accept */); + const MempoolAcceptResult result = node.chainman->ProcessTransaction(tx, /*test_accept=*/ false); if (result.m_result_type != MempoolAcceptResult::ResultType::VALID) { return HandleATMPError(result.m_state, err_string); } |