diff --git a/src/test/validation_chainstate_tests.cpp b/src/test/validation_chainstate_tests.cpp --- a/src/test/validation_chainstate_tests.cpp +++ b/src/test/validation_chainstate_tests.cpp @@ -10,7 +10,6 @@ #include #include #include -#include #include #include @@ -18,18 +17,12 @@ #include -BOOST_FIXTURE_TEST_SUITE(validation_chainstate_tests, TestingSetup) +BOOST_FIXTURE_TEST_SUITE(validation_chainstate_tests, ChainTestingSetup) //! Test resizing coins-related Chainstate caches during runtime. //! BOOST_AUTO_TEST_CASE(validation_chainstate_resize_caches) { - const ChainstateManager::Options chainman_opts{ - .config = GetConfig(), - .adjusted_time_callback = GetAdjustedTime, - }; - ChainstateManager manager{chainman_opts}; - WITH_LOCK(::cs_main, manager.m_blockman.m_block_tree_db = - std::make_unique(1 << 20, true)); + ChainstateManager &manager = *Assert(m_node.chainman); CTxMemPool &mempool = *Assert(m_node.mempool); //! Create and add a Coin with DynamicMemoryUsage of 80 bytes to the given diff --git a/src/test/validation_flush_tests.cpp b/src/test/validation_flush_tests.cpp --- a/src/test/validation_flush_tests.cpp +++ b/src/test/validation_flush_tests.cpp @@ -4,14 +4,11 @@ // #include #include -#include #include #include -using node::BlockManager; - -BOOST_FIXTURE_TEST_SUITE(validation_flush_tests, ChainTestingSetup) +BOOST_FIXTURE_TEST_SUITE(validation_flush_tests, TestingSetup) //! Test utilities for detecting when we need to flush the coins cache based //! on estimated memory usage. @@ -19,12 +16,7 @@ //! @sa Chainstate::GetCoinsCacheSizeState() //! BOOST_AUTO_TEST_CASE(getcoinscachesizestate) { - CTxMemPool &mempool = *Assert(m_node.mempool); - BlockManager blockman{}; - Chainstate chainstate{&mempool, blockman, *Assert(m_node.chainman)}; - chainstate.InitCoinsDB(/*cache_size_bytes*/ 1 << 10, /*in_memory*/ true, - /*should_wipe*/ false); - WITH_LOCK(::cs_main, chainstate.InitCoinsCache(1 << 10)); + Chainstate &chainstate{m_node.chainman->ActiveChainstate()}; constexpr bool is_64_bit = sizeof(void *) == 8;