From 8d466a8504bfb81ce8699d650aa72ec9cc8b0a54 Mon Sep 17 00:00:00 2001 From: Carl Dong Date: Fri, 12 Nov 2021 18:15:47 -0500 Subject: Move -checkblocks LogPrintf to AppInitMain --- src/init.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/init.cpp') diff --git a/src/init.cpp b/src/init.cpp index 411692d88b..0c5baeee3b 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1477,11 +1477,16 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) std::optional rv2; try { uiInterface.InitMessage(_("Verifying blocks…").translated); + auto check_blocks = args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS); + if (fHavePruned && check_blocks > MIN_BLOCKS_TO_KEEP) { + LogPrintf("Prune: pruned datadir may not have more than %d blocks; only checking available blocks\n", + MIN_BLOCKS_TO_KEEP); + } rv2 = VerifyLoadedChainstate(chainman, fReset, fReindexChainState, chainparams, - args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS), + check_blocks, args.GetIntArg("-checklevel", DEFAULT_CHECKLEVEL)); } catch (const std::exception& e) { LogPrintf("%s\n", e.what()); -- cgit v1.2.3