Skip to content

Commit ce8b0f9

Browse files
committed
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.
1 parent 3837700 commit ce8b0f9

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

src/bitcoin-chainstate.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ int main(int argc, char* argv[])
7878

7979
// SETUP: Chainstate
8080
const ChainstateManager::Options chainman_opts{
81-
chainparams,
82-
static_cast<int64_t(*)()>(GetTime),
81+
.chainparams = chainparams,
82+
.adjusted_time_callback = static_cast<int64_t (*)()>(GetTime),
8383
};
8484
ChainstateManager chainman{chainman_opts};
8585

src/init.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,8 +1440,8 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
14401440
node.mempool = std::make_unique<CTxMemPool>(mempool_opts);
14411441

14421442
const ChainstateManager::Options chainman_opts{
1443-
chainparams,
1444-
GetAdjustedTime,
1443+
.chainparams = chainparams,
1444+
.adjusted_time_callback = GetAdjustedTime,
14451445
};
14461446
node.chainman = std::make_unique<ChainstateManager>(chainman_opts);
14471447
ChainstateManager& chainman = *node.chainman;

src/test/util/setup_common.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ ChainTestingSetup::ChainTestingSetup(const std::string& chainName, const std::ve
183183
m_cache_sizes = CalculateCacheSizes(m_args);
184184

185185
const ChainstateManager::Options chainman_opts{
186-
chainparams,
187-
GetAdjustedTime,
186+
.chainparams = chainparams,
187+
.adjusted_time_callback = GetAdjustedTime,
188188
};
189189
m_node.chainman = std::make_unique<ChainstateManager>(chainman_opts);
190190
m_node.chainman->m_blockman.m_block_tree_db = std::make_unique<CBlockTreeDB>(m_cache_sizes.block_tree_db, true);

src/test/validation_chainstate_tests.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ BOOST_FIXTURE_TEST_SUITE(validation_chainstate_tests, TestingSetup)
2424
BOOST_AUTO_TEST_CASE(validation_chainstate_resize_caches)
2525
{
2626
const ChainstateManager::Options chainman_opts{
27-
Params(),
28-
GetAdjustedTime,
27+
.chainparams = Params(),
28+
.adjusted_time_callback = GetAdjustedTime,
2929
};
3030
ChainstateManager manager{chainman_opts};
3131

0 commit comments

Comments
 (0)