Skip to content

Commit 94c0ceb

Browse files
committed
Move -checkblocks LogPrintf to AppInitMain
1 parent d3345ee commit 94c0ceb

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/init.cpp

+6-1
Original file line numberDiff line numberDiff line change
@@ -1960,12 +1960,17 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
19601960
std::optional<ChainstateLoadVerifyError> rv2;
19611961
try {
19621962
uiInterface.InitMessage(_("Verifying blocks…").translated);
1963+
auto check_blocks = args.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS);
1964+
if (chainman.m_blockman.m_have_pruned && check_blocks > MIN_BLOCKS_TO_KEEP) {
1965+
LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n",
1966+
MIN_BLOCKS_TO_KEEP);
1967+
}
19631968
rv2 = VerifyLoadedChainstate(chainman,
19641969
*Assert(node.evodb.get()),
19651970
fReset,
19661971
fReindexChainState,
19671972
chainparams,
1968-
args.GetArg("-checkblocks", DEFAULT_CHECKBLOCKS),
1973+
check_blocks,
19691974
args.GetArg("-checklevel", DEFAULT_CHECKLEVEL));
19701975
} catch (const std::exception& e) {
19711976
LogPrintf("%s\n", e.what());

src/node/chainstate.cpp

-5
Original file line numberDiff line numberDiff line change
@@ -245,11 +245,6 @@ std::optional<ChainstateLoadVerifyError> VerifyLoadedChainstate(ChainstateManage
245245

246246
for (CChainState* chainstate : chainman.GetAll()) {
247247
if (!is_coinsview_empty(chainstate)) {
248-
if (chainman.m_blockman.m_have_pruned && check_blocks > MIN_BLOCKS_TO_KEEP) {
249-
LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n",
250-
MIN_BLOCKS_TO_KEEP);
251-
}
252-
253248
const CBlockIndex* tip = chainstate->m_chain.Tip();
254249
RPCNotifyBlockChange(tip);
255250
if (tip && tip->nTime > GetTime() + MAX_FUTURE_BLOCK_TIME) {

0 commit comments

Comments
 (0)