kernel: Prefer contrived names over tuple

hodlinator · Dec 21, 2024 · 196269a · 196269a
1 parent b98b047
commit 196269a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/src/node/caches.cpp b/src/node/caches.cpp
@@ -20,7 +20,7 @@ static constexpr int64_t MAX_FILTER_INDEX_CACHE{1024};
 using kernel::MiBToBytes;
 
 namespace node {
-std::tuple<IndexCacheSizes, kernel::CacheSizes> CalculateCacheSizes(const ArgsManager& args, size_t n_indexes)
+IndexAndKernelCacheSizes CalculateCacheSizes(const ArgsManager& args, size_t n_indexes)
 {
     size_t nTotalCache{MiBToBytes(args.GetIntArg("-dbcache", DEFAULT_DB_CACHE))};
     nTotalCache = std::max(nTotalCache, MiBToBytes(MIN_DB_CACHE));

diff --git a/src/node/caches.h b/src/node/caches.h
@@ -23,7 +23,11 @@ struct IndexCacheSizes {
     size_t tx_index;
     size_t filter_index;
 };
-std::tuple<IndexCacheSizes, kernel::CacheSizes> CalculateCacheSizes(const ArgsManager& args, size_t n_indexes = 0);
+struct IndexAndKernelCacheSizes {
+    IndexCacheSizes index;
+    kernel::CacheSizes kernel;
+};
+IndexAndKernelCacheSizes CalculateCacheSizes(const ArgsManager& args, size_t n_indexes = 0);
 } // namespace node
 
 #endif // BITCOIN_NODE_CACHES_H
diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h
@@ -104,7 +104,7 @@ struct BasicTestingSetup {
  * initialization behaviour.
  */
 struct ChainTestingSetup : public BasicTestingSetup {
-    kernel::CacheSizes m_kernel_cache_sizes{std::get<1>(node::CalculateCacheSizes(m_args))};
+    kernel::CacheSizes m_kernel_cache_sizes{node::CalculateCacheSizes(m_args).kernel};
     bool m_coins_db_in_memory{true};
     bool m_block_tree_db_in_memory{true};
     std::function<void()> m_make_chainman{};