Could we fold this into getcoinscachesizestate above? The existing test already grows the same cache through the relevant thresholds; resizing the chainstate cache first lets it cover the unused-
mempool-space case without a second growth loop.
diff --git a/src/test/validation_flush_tests.cpp b/src/test/validation_flush_tests.cpp
--- a/src/test/validation_flush_tests.cpp (revision 78f052a4053e71490cc3ac697a84c3d88a80fe20)
+++ b/src/test/validation_flush_tests.cpp (revision 241cb62d7a1fc0713fede5a3ca7fa0c16d74ffc9)
@@ -18,33 +18,34 @@
//! 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{40'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 +53,7 @@
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,30 +61,10 @@
// 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);
}
