diff --git a/src/bitcoin-chainstate.cpp b/src/bitcoin-chainstate.cpp --- a/src/bitcoin-chainstate.cpp +++ b/src/bitcoin-chainstate.cpp @@ -103,8 +103,7 @@ << std::endl; goto epilogue; } - std::tie(status, error) = - node::VerifyLoadedChainstate(chainman, options, config); + std::tie(status, error) = node::VerifyLoadedChainstate(chainman, options); if (status != node::ChainstateLoadStatus::SUCCESS) { std::cerr << "Failed to verify loaded Chain state from your datadir." << std::endl; diff --git a/src/init.cpp b/src/init.cpp --- a/src/init.cpp +++ b/src/init.cpp @@ -2492,9 +2492,8 @@ "blocks; only checking available blocks\n", MIN_BLOCKS_TO_KEEP); } - std::tie(status, error) = catch_exceptions([&] { - return VerifyLoadedChainstate(chainman, options, config); - }); + std::tie(status, error) = catch_exceptions( + [&] { return VerifyLoadedChainstate(chainman, options); }); if (status == node::ChainstateLoadStatus::SUCCESS) { fLoaded = true; LogPrintf(" block index %15dms\n", diff --git a/src/node/chainstate.h b/src/node/chainstate.h --- a/src/node/chainstate.h +++ b/src/node/chainstate.h @@ -72,8 +72,7 @@ ChainstateLoadResult VerifyLoadedChainstate(ChainstateManager &chainman, - const ChainstateLoadOptions &options, - const Config &config); + const ChainstateLoadOptions &options); } // namespace node #endif // BITCOIN_NODE_CHAINSTATE_H diff --git a/src/node/chainstate.cpp b/src/node/chainstate.cpp --- a/src/node/chainstate.cpp +++ b/src/node/chainstate.cpp @@ -253,8 +253,7 @@ ChainstateLoadResult VerifyLoadedChainstate(ChainstateManager &chainman, - const ChainstateLoadOptions &options, - const Config &config) { + const ChainstateLoadOptions &options) { auto is_coinsview_empty = [&](Chainstate *chainstate) EXCLUSIVE_LOCKS_REQUIRED(::cs_main) { return options.reindex || options.reindex_chainstate || @@ -276,9 +275,9 @@ "that your computer's date and time are correct")}; } - VerifyDBResult result = - CVerifyDB().VerifyDB(*chainstate, config, chainstate->CoinsDB(), - options.check_level, options.check_blocks); + VerifyDBResult result = CVerifyDB().VerifyDB( + *chainstate, chainman.GetConfig(), chainstate->CoinsDB(), + options.check_level, options.check_blocks); switch (result) { case VerifyDBResult::SUCCESS: case VerifyDBResult::SKIPPED_MISSING_BLOCKS: diff --git a/src/test/util/setup_common.h b/src/test/util/setup_common.h --- a/src/test/util/setup_common.h +++ b/src/test/util/setup_common.h @@ -131,7 +131,7 @@ bool m_coins_db_in_memory{true}; bool m_block_tree_db_in_memory{true}; - void LoadVerifyActivateChainstate(const Config &config); + void LoadVerifyActivateChainstate(); explicit TestingSetup(const std::string &chainName = CBaseChainParams::MAIN, const std::vector &extra_args = {}, diff --git a/src/test/util/setup_common.cpp b/src/test/util/setup_common.cpp --- a/src/test/util/setup_common.cpp +++ b/src/test/util/setup_common.cpp @@ -242,7 +242,7 @@ m_node.chainman.reset(); } -void TestingSetup::LoadVerifyActivateChainstate(const Config &config) { +void TestingSetup::LoadVerifyActivateChainstate() { auto &chainman{*Assert(m_node.chainman)}; node::ChainstateLoadOptions options; options.mempool = Assert(m_node.mempool.get()); @@ -260,7 +260,7 @@ auto [status, error] = LoadChainstate(chainman, m_cache_sizes, options); assert(status == node::ChainstateLoadStatus::SUCCESS); - std::tie(status, error) = VerifyLoadedChainstate(chainman, options, config); + std::tie(status, error) = VerifyLoadedChainstate(chainman, options); assert(status == node::ChainstateLoadStatus::SUCCESS); BlockValidationState state; @@ -294,7 +294,7 @@ SetRPCWarmupFinished(); } - LoadVerifyActivateChainstate(config); + LoadVerifyActivateChainstate(); m_node.addrman = std::make_unique( /* asmap= */ std::vector(), /* consistency_check_ratio= */ 0); diff --git a/src/test/validation_chainstatemanager_tests.cpp b/src/test/validation_chainstatemanager_tests.cpp --- a/src/test/validation_chainstatemanager_tests.cpp +++ b/src/test/validation_chainstatemanager_tests.cpp @@ -542,7 +542,7 @@ BOOST_TEST_MESSAGE("Performing Load/Verify/Activate of chainstate"); // This call reinitializes the chainstates. - this->LoadVerifyActivateChainstate(::GetConfig()); + this->LoadVerifyActivateChainstate(); { LOCK(chainman_restarted.GetMutex()); @@ -633,7 +633,7 @@ // This call reinitializes the chainstates, and should clean up the now // unnecessary background-validation leveldb contents. - this->LoadVerifyActivateChainstate(::GetConfig()); + this->LoadVerifyActivateChainstate(); BOOST_CHECK(!fs::exists(snapshot_invalid_dir)); // chainstate_snapshot should now *not* exist. @@ -711,7 +711,7 @@ // This call reinitializes the chainstates, and should clean up the now // unnecessary background-validation leveldb contents. - this->LoadVerifyActivateChainstate(::GetConfig()); + this->LoadVerifyActivateChainstate(); BOOST_CHECK(fs::exists(snapshot_invalid_dir)); BOOST_CHECK(!fs::exists(snapshot_chainstate_dir));