From fa57c449cf45a4f1df195970c711bba8f02f3cc6 Mon Sep 17 00:00:00 2001 From: MacroFake Date: Sun, 24 Jul 2022 16:41:38 +0200 Subject: [PATCH] fuzz: Remove no-op SetMempoolConstraints --- src/test/fuzz/tx_pool.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/test/fuzz/tx_pool.cpp b/src/test/fuzz/tx_pool.cpp index 63fbf0516a2..cfb112879af 100644 --- a/src/test/fuzz/tx_pool.cpp +++ b/src/test/fuzz/tx_pool.cpp @@ -136,7 +136,6 @@ FUZZ_TARGET_INIT(tx_pool_standard, initialize_tx_pool) auto& chainstate{static_cast(node.chainman->ActiveChainstate())}; MockTime(fuzzed_data_provider, chainstate); - SetMempoolConstraints(*node.args, fuzzed_data_provider); // All RBF-spendable outpoints std::set outpoints_rbf; @@ -150,6 +149,7 @@ FUZZ_TARGET_INIT(tx_pool_standard, initialize_tx_pool) // The sum of the values of all spendable outpoints constexpr CAmount SUPPLY_TOTAL{COINBASE_MATURITY * 50 * COIN}; + SetMempoolConstraints(*node.args, fuzzed_data_provider); CTxMemPool tx_pool_{MakeMempool(node)}; MockedTxPool& tx_pool = *static_cast(&tx_pool_); @@ -220,9 +220,6 @@ FUZZ_TARGET_INIT(tx_pool_standard, initialize_tx_pool) if (fuzzed_data_provider.ConsumeBool()) { MockTime(fuzzed_data_provider, chainstate); } - if (fuzzed_data_provider.ConsumeBool()) { - SetMempoolConstraints(*node.args, fuzzed_data_provider); - } if (fuzzed_data_provider.ConsumeBool()) { tx_pool.RollingFeeUpdate(); } @@ -316,7 +313,6 @@ FUZZ_TARGET_INIT(tx_pool, initialize_tx_pool) auto& chainstate = node.chainman->ActiveChainstate(); MockTime(fuzzed_data_provider, chainstate); - SetMempoolConstraints(*node.args, fuzzed_data_provider); std::vector txids; for (const auto& outpoint : g_outpoints_coinbase_init_mature) { @@ -328,6 +324,7 @@ FUZZ_TARGET_INIT(tx_pool, initialize_tx_pool) txids.push_back(ConsumeUInt256(fuzzed_data_provider)); } + SetMempoolConstraints(*node.args, fuzzed_data_provider); CTxMemPool tx_pool_{MakeMempool(node)}; MockedTxPool& tx_pool = *static_cast(&tx_pool_); @@ -338,9 +335,6 @@ FUZZ_TARGET_INIT(tx_pool, initialize_tx_pool) if (fuzzed_data_provider.ConsumeBool()) { MockTime(fuzzed_data_provider, chainstate); } - if (fuzzed_data_provider.ConsumeBool()) { - SetMempoolConstraints(*node.args, fuzzed_data_provider); - } if (fuzzed_data_provider.ConsumeBool()) { tx_pool.RollingFeeUpdate(); }