diff options
| author | glozow <gloriajzhao@gmail.com> | 2024-04-29 17:53:59 +0100 |
|---|---|---|
| committer | glozow <gloriajzhao@gmail.com> | 2024-05-01 13:34:37 +0100 |
| commit | 8496f69e1c2d1961db2604829cb6a289eb8dd3d6 (patch) | |
| tree | 81d70e34c31c352672bc5a2a665a6ccecf90f46e /src/test | |
| parent | 842f7fdf786fcbbdf3df40522945813404f8a397 (diff) | |
| download | bitcoin-8496f69e1c2d1961db2604829cb6a289eb8dd3d6.tar.xz | |
[refactor] make MempoolAcceptResult::m_replaced_transactions non-optional
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/fuzz/tx_pool.cpp | 2 | ||||
| -rw-r--r-- | src/test/util/txmempool.cpp | 6 |
2 files changed, 0 insertions, 8 deletions
diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp index 0b4019d5eb..9f0aedf29b 100644 --- a/src/test/fuzz/tx_pool.cpp +++ b/src/test/fuzz/tx_pool.cpp @@ -139,7 +139,6 @@ void CheckATMPInvariants(const MempoolAcceptResult& res, bool txid_in_mempool, b Assert(wtxid_in_mempool); Assert(res.m_state.IsValid()); Assert(!res.m_state.IsInvalid()); - Assert(res.m_replaced_transactions); Assert(res.m_vsize); Assert(res.m_base_fees); Assert(res.m_effective_feerate); @@ -154,7 +153,6 @@ void CheckATMPInvariants(const MempoolAcceptResult& res, bool txid_in_mempool, b Assert(res.m_state.IsInvalid()); const bool is_reconsiderable{res.m_state.GetResult() == TxValidationResult::TX_RECONSIDERABLE}; - Assert(!res.m_replaced_transactions); Assert(!res.m_vsize); Assert(!res.m_base_fees); // Fee information is provided if the failure is TX_RECONSIDERABLE. diff --git a/src/test/util/txmempool.cpp b/src/test/util/txmempool.cpp index 71cf8aca60..870cdd0b32 100644 --- a/src/test/util/txmempool.cpp +++ b/src/test/util/txmempool.cpp @@ -68,12 +68,6 @@ std::optional<std::string> CheckPackageMempoolAcceptResult(const Package& txns, return strprintf("tx %s unexpectedly failed: %s", wtxid.ToString(), atmp_result.m_state.ToString()); } - //m_replaced_transactions should exist iff the result was VALID - if (atmp_result.m_replaced_transactions.has_value() != valid) { - return strprintf("tx %s result should %shave m_replaced_transactions", - wtxid.ToString(), valid ? "" : "not "); - } - // m_vsize and m_base_fees should exist iff the result was VALID or MEMPOOL_ENTRY const bool mempool_entry{atmp_result.m_result_type == MempoolAcceptResult::ResultType::MEMPOOL_ENTRY}; if (atmp_result.m_base_fees.has_value() != (valid || mempool_entry)) { |