From 5d57f2cefee2acec3c8e11d6b1d5b5fe97e6cfe7 Mon Sep 17 00:00:00 2001 From: woltx <94266259+w0xlt@users.noreply.github.com> Date: Mon, 8 Jun 2026 15:54:27 -0700 Subject: [PATCH] test: cover unused mempool space in coins cache Co-authored-by: l0rinc --- src/test/validation_flush_tests.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/test/validation_flush_tests.cpp b/src/test/validation_flush_tests.cpp index c35cef7f45c..263edd8b7d8 100644 --- a/src/test/validation_flush_tests.cpp +++ b/src/test/validation_flush_tests.cpp @@ -18,33 +18,33 @@ BOOST_FIXTURE_TEST_SUITE(validation_flush_tests, TestingSetup) //! then with additional mempool head-room. BOOST_AUTO_TEST_CASE(getcoinscachesizestate) { + constexpr uint64_t MAX_COINS_BYTES{8_MiB}; + constexpr uint64_t MAX_MEMPOOL_BYTES{4_MiB}; + constexpr uint64_t MAX_ATTEMPTS{50'000}; Chainstate& chainstate{m_node.chainman->ActiveChainstate()}; LOCK(::cs_main); + BOOST_REQUIRE(chainstate.ResizeCoinsCaches(MAX_COINS_BYTES, /*coinsdb_size=*/1_MiB)); CCoinsViewCache& view{chainstate.CoinsTip()}; // Sanity: an empty cache should be ≲ 1 chunk (~ 256 KiB). BOOST_CHECK_LT(view.DynamicMemoryUsage() / (256 * 1024.0), 1.1); - constexpr size_t MAX_COINS_BYTES{8_MiB}; - constexpr size_t MAX_MEMPOOL_BYTES{4_MiB}; - constexpr size_t MAX_ATTEMPTS{50'000}; - // Run the same growth-path twice: first with 0 head-room, then with extra head-room - for (size_t max_mempool_size_bytes : {size_t{0}, MAX_MEMPOOL_BYTES}) { + for (uint64_t max_mempool_size_bytes : {uint64_t{0}, MAX_MEMPOOL_BYTES}) { const int64_t full_cap{int64_t(MAX_COINS_BYTES + max_mempool_size_bytes)}; const int64_t large_cap{LargeCoinsCacheThreshold(full_cap)}; // OK → LARGE auto state{chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, max_mempool_size_bytes)}; - for (size_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= large_cap; ++i) { + for (uint64_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= large_cap; ++i) { BOOST_CHECK_EQUAL(state, CoinsCacheSizeState::OK); AddTestCoin(m_rng, view); state = chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, max_mempool_size_bytes); } // LARGE → CRITICAL - for (size_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= full_cap; ++i) { + for (uint64_t i{0}; i < MAX_ATTEMPTS && int64_t(view.DynamicMemoryUsage()) <= full_cap; ++i) { BOOST_CHECK_EQUAL(state, CoinsCacheSizeState::LARGE); AddTestCoin(m_rng, view); state = chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, max_mempool_size_bytes); @@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(getcoinscachesizestate) BOOST_CHECK_EQUAL(state, CoinsCacheSizeState::CRITICAL); } - // Default thresholds (no explicit limits) permit many more coins. + // Unused mempool space permits many more coins. for (int i{0}; i < 1'000; ++i) { AddTestCoin(m_rng, view); BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(), CoinsCacheSizeState::OK); @@ -60,6 +60,7 @@ BOOST_AUTO_TEST_CASE(getcoinscachesizestate) // CRITICAL → OK via Flush BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, /*max_mempool_size_bytes=*/0), CoinsCacheSizeState::CRITICAL); + BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(), CoinsCacheSizeState::OK); view.SetBestBlock(m_rng.rand256()); view.Flush(); BOOST_CHECK_EQUAL(chainstate.GetCoinsCacheSizeState(MAX_COINS_BYTES, /*max_mempool_size_bytes=*/0), CoinsCacheSizeState::OK);