diff --git a/src/test/fuzz/coins_view.cpp b/src/test/fuzz/coins_view.cpp index 8f3e357a844..41c971c237b 100644 --- a/src/test/fuzz/coins_view.cpp +++ b/src/test/fuzz/coins_view.cpp @@ -27,7 +27,6 @@ #include namespace { -const TestingSetup* g_setup; const Coin EMPTY_COIN{}; bool operator==(const Coin& a, const Coin& b) @@ -39,8 +38,7 @@ bool operator==(const Coin& a, const Coin& b) void initialize_coins_view() { - static const auto testing_setup = MakeNoLogFileContext(); - g_setup = testing_setup.get(); + static const auto testing_setup = MakeNoLogFileContext<>(); } FUZZ_TARGET(coins_view, .init = initialize_coins_view) diff --git a/src/test/fuzz/utxo_snapshot.cpp b/src/test/fuzz/utxo_snapshot.cpp index 522c9c54eed..60d9d39b73f 100644 --- a/src/test/fuzz/utxo_snapshot.cpp +++ b/src/test/fuzz/utxo_snapshot.cpp @@ -31,7 +31,13 @@ void initialize_chain() FUZZ_TARGET(utxo_snapshot, .init = initialize_chain) { FuzzedDataProvider fuzzed_data_provider(buffer.data(), buffer.size()); - std::unique_ptr setup{MakeNoLogFileContext()}; + std::unique_ptr setup{ + MakeNoLogFileContext( + ChainType::REGTEST, + TestOpts{ + .setup_net = false, + .setup_validation_interface = false, + })}; const auto& node = setup->m_node; auto& chainman{*node.chainman}; diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp index d0c465d189d..abe3d6a505b 100644 --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -230,9 +230,11 @@ ChainTestingSetup::ChainTestingSetup(const ChainType chainType, TestOpts opts) // We have to run a scheduler thread to prevent ActivateBestChain // from blocking due to queue overrun. - m_node.scheduler = std::make_unique(); - m_node.scheduler->m_service_thread = std::thread(util::TraceThread, "scheduler", [&] { m_node.scheduler->serviceQueue(); }); - m_node.validation_signals = std::make_unique(std::make_unique(*m_node.scheduler)); + if (opts.setup_validation_interface) { + m_node.scheduler = std::make_unique(); + m_node.scheduler->m_service_thread = std::thread(util::TraceThread, "scheduler", [&] { m_node.scheduler->serviceQueue(); }); + m_node.validation_signals = std::make_unique(std::make_unique(*m_node.scheduler)); + } m_node.fee_estimator = std::make_unique(FeeestPath(*m_node.args), DEFAULT_ACCEPT_STALE_FEE_ESTIMATES); bilingual_str error{}; @@ -267,7 +269,7 @@ ChainTestingSetup::ChainTestingSetup(const ChainType chainType, TestOpts opts) ChainTestingSetup::~ChainTestingSetup() { if (m_node.scheduler) m_node.scheduler->stop(); - m_node.validation_signals->FlushBackgroundCallbacks(); + if (m_node.validation_signals) m_node.validation_signals->FlushBackgroundCallbacks(); m_node.connman.reset(); m_node.banman.reset(); m_node.addrman.reset(); @@ -318,6 +320,8 @@ TestingSetup::TestingSetup( LoadVerifyActivateChainstate(); + if (!opts.setup_net) return; + m_node.netgroupman = std::make_unique(/*asmap=*/std::vector()); m_node.addrman = std::make_unique(*m_node.netgroupman, /*deterministic=*/false, diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h index 6d8fcbbbfb5..9515f0255ec 100644 --- a/src/test/util/setup_common.h +++ b/src/test/util/setup_common.h @@ -53,6 +53,8 @@ struct TestOpts { std::vector extra_args{}; bool coins_db_in_memory{true}; bool block_tree_db_in_memory{true}; + bool setup_net{true}; + bool setup_validation_interface{true}; }; /** Basic testing setup.