aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2022-07-13 14:16:15 -0400
committerCarl Dong <contact@carldong.me>2022-07-14 08:35:23 -0400
commitce8b0f971b94e68db1e902dbd20dd99dcf9bcb0a (patch)
tree6361f1ff8b0256cc2d94b7b1f73c02fae491788a
parent38377002671d038aadb01e1521ea95c97838cedc (diff)
downloadbitcoin-ce8b0f971b94e68db1e902dbd20dd99dcf9bcb0a.tar.xz
Use designated initializers for ChainstateManager::Options
This wasn't available at the time when ChainstateManager::Options was introduced but is helpful to be explicit and ensure correctness.
-rw-r--r--src/bitcoin-chainstate.cpp4
-rw-r--r--src/init.cpp4
-rw-r--r--src/test/util/setup_common.cpp4
-rw-r--r--src/test/validation_chainstate_tests.cpp4
4 files changed, 8 insertions, 8 deletions
diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp
index 1817aa1a53..d53e917aba 100644
--- a/src/bitcoin-chainstate.cpp
+++ b/src/bitcoin-chainstate.cpp
@@ -78,8 +78,8 @@ int main(int argc, char* argv[])
// SETUP: Chainstate
const ChainstateManager::Options chainman_opts{
- chainparams,
- static_cast<int64_t(*)()>(GetTime),
+ .chainparams = chainparams,
+ .adjusted_time_callback = static_cast<int64_t (*)()>(GetTime),
};
ChainstateManager chainman{chainman_opts};
diff --git a/src/init.cpp b/src/init.cpp
index 816404a84f..267070a4c9 100644
--- a/src/init.cpp
+++ b/src/init.cpp
@@ -1440,8 +1440,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
node.mempool = std::make_unique<CTxMemPool>(mempool_opts);
const ChainstateManager::Options chainman_opts{
- chainparams,
- GetAdjustedTime,
+ .chainparams = chainparams,
+ .adjusted_time_callback = GetAdjustedTime,
};
node.chainman = std::make_unique<ChainstateManager>(chainman_opts);
ChainstateManager& chainman = *node.chainman;
diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp
index de53499088..0fba9258f1 100644
--- a/src/test/util/setup_common.cpp
+++ b/src/test/util/setup_common.cpp
@@ -183,8 +183,8 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::ve
m_cache_sizes = CalculateCacheSizes(m_args);
const ChainstateManager::Options chainman_opts{
- chainparams,
- GetAdjustedTime,
+ .chainparams = chainparams,
+ .adjusted_time_callback = GetAdjustedTime,
};
m_node.chainman = std::make_unique<ChainstateManager>(chainman_opts);
m_node.chainman->m_blockman.m_block_tree_db = std::make_unique<CBlockTreeDB>(m_cache_sizes.block_tree_db, true);
diff --git a/src/test/validation_chainstate_tests.cpp b/src/test/validation_chainstate_tests.cpp
index 102de74389..78adb521ac 100644
--- a/src/test/validation_chainstate_tests.cpp
+++ b/src/test/validation_chainstate_tests.cpp
@@ -24,8 +24,8 @@ BOOST_FIXTURE_TEST_SUITE(validation_chainstate_tests, TestingSetup)
BOOST_AUTO_TEST_CASE(validation_chainstate_resize_caches)
{
const ChainstateManager::Options chainman_opts{
- Params(),
- GetAdjustedTime,
+ .chainparams = Params(),
+ .adjusted_time_callback = GetAdjustedTime,
};
ChainstateManager manager{chainman_opts};