diff --git a/src/test/checkqueue_tests.cpp b/src/test/checkqueue_tests.cpp index 2d13a267607..3e2fc83ff28 100644 --- a/src/test/checkqueue_tests.cpp +++ b/src/test/checkqueue_tests.cpp @@ -21,16 +21,16 @@ #include /** - * Identical to TestingSetup but excludes lock contention logging if + * Identical to BasicTestingSetup but excludes lock contention logging if * `DEBUG_LOCKCONTENTION` is defined, as some of these tests are designed to be * heavily contested to trigger race conditions or other issues. */ -struct NoLockLoggingTestingSetup : public TestingSetup { +struct NoLockLoggingTestingSetup : public BasicTestingSetup { NoLockLoggingTestingSetup() #ifdef DEBUG_LOCKCONTENTION - : TestingSetup{ChainType::MAIN, {.extra_args = { "-debugexclude=lock" } }} {} + : BasicTestingSetup{ChainType::MAIN, {.extra_args = { "-debugexclude=lock" } }} {} #else - : TestingSetup{ChainType::MAIN} {} + : BasicTestingSetup{ChainType::MAIN} {} #endif }; diff --git a/src/test/merkle_tests.cpp b/src/test/merkle_tests.cpp index a7212147b62..a6dd23adb17 100644 --- a/src/test/merkle_tests.cpp +++ b/src/test/merkle_tests.cpp @@ -9,7 +9,7 @@ #include -BOOST_FIXTURE_TEST_SUITE(merkle_tests, TestingSetup) +BOOST_FIXTURE_TEST_SUITE(merkle_tests, BasicTestingSetup) static uint256 ComputeMerkleRootFromBranch(const uint256& leaf, const std::vector& vMerkleBranch, uint32_t nIndex) { uint256 hash = leaf; diff --git a/src/test/orphanage_tests.cpp b/src/test/orphanage_tests.cpp index 6ebfab34c52..1f303993c66 100644 --- a/src/test/orphanage_tests.cpp +++ b/src/test/orphanage_tests.cpp @@ -20,7 +20,7 @@ #include -BOOST_FIXTURE_TEST_SUITE(orphanage_tests, TestingSetup) +BOOST_FIXTURE_TEST_SUITE(orphanage_tests, BasicTestingSetup) static void MakeNewKeyWithFastRandomContext(CKey& key, FastRandomContext& rand_ctx) { diff --git a/src/test/prevector_tests.cpp b/src/test/prevector_tests.cpp index 4b63e76fa9c..f9dcaae035f 100644 --- a/src/test/prevector_tests.cpp +++ b/src/test/prevector_tests.cpp @@ -13,7 +13,7 @@ #include #include -BOOST_FIXTURE_TEST_SUITE(prevector_tests, TestingSetup) +BOOST_FIXTURE_TEST_SUITE(prevector_tests, BasicTestingSetup) template class prevector_tester diff --git a/src/test/rbf_tests.cpp b/src/test/rbf_tests.cpp index 0ffe0846c25..e2a95148e4d 100644 --- a/src/test/rbf_tests.cpp +++ b/src/test/rbf_tests.cpp @@ -14,7 +14,7 @@ #include #include -BOOST_FIXTURE_TEST_SUITE(rbf_tests, TestingSetup) +BOOST_FIXTURE_TEST_SUITE(rbf_tests, BasicTestingSetup) static inline CTransactionRef make_tx(const std::vector& inputs, const std::vector& output_values) diff --git a/src/test/validation_tests.cpp b/src/test/validation_tests.cpp index 80f3289704b..b1e204f1741 100644 --- a/src/test/validation_tests.cpp +++ b/src/test/validation_tests.cpp @@ -19,7 +19,7 @@ #include -BOOST_FIXTURE_TEST_SUITE(validation_tests, TestingSetup) +BOOST_FIXTURE_TEST_SUITE(validation_tests, BasicTestingSetup) static void TestBlockSubsidyHalvings(const Consensus::Params& consensusParams) {