diff options
author | Carl Dong <contact@carldong.me> | 2022-03-18 12:35:52 -0400 |
---|---|---|
committer | Carl Dong <contact@carldong.me> | 2022-04-19 14:36:18 -0400 |
commit | f0a2fb3c5dbf3c4bec7faf934baff3e723734b3f (patch) | |
tree | f9ca702d34d9736f804eb3fc5a1a75208640d260 /src/init.cpp | |
parent | a4014021258319941716d6338c18667462a06280 (diff) | |
download | bitcoin-f0a2fb3c5dbf3c4bec7faf934baff3e723734b3f.tar.xz |
scripted-diff: Rename pindexBestHeader, fHavePruned
...to m_best_header and m_have_pruned
-BEGIN VERIFY SCRIPT-
find_regex="\bpindexBestHeader\b" \
&& git grep -l -E "$find_regex" -- src \
| xargs sed -i -E "s@$find_regex@m_best_header@g"
find_regex="\bfHavePruned\b" \
&& git grep -l -E "$find_regex" -- src \
| xargs sed -i -E "s@$find_regex@m_have_pruned@g"
-END VERIFY SCRIPT-
Diffstat (limited to 'src/init.cpp')
-rw-r--r-- | src/init.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/init.cpp b/src/init.cpp index 6d7c0403e9..558adcf74d 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -1479,7 +1479,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) try { uiInterface.InitMessage(_("Verifying blocks…").translated); auto check_blocks = args.GetIntArg("-checkblocks", DEFAULT_CHECKBLOCKS); - if (chainman.m_blockman.fHavePruned && check_blocks > MIN_BLOCKS_TO_KEEP) { + if (chainman.m_blockman.m_have_pruned && 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); } @@ -1663,9 +1663,9 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info) tip_info->block_time = chainman.ActiveChain().Tip() ? chainman.ActiveChain().Tip()->GetBlockTime() : Params().GenesisBlock().GetBlockTime(); tip_info->verification_progress = GuessVerificationProgress(Params().TxData(), chainman.ActiveChain().Tip()); } - if (tip_info && chainman.pindexBestHeader) { - tip_info->header_height = chainman.pindexBestHeader->nHeight; - tip_info->header_time = chainman.pindexBestHeader->GetBlockTime(); + if (tip_info && chainman.m_best_header) { + tip_info->header_height = chainman.m_best_header->nHeight; + tip_info->header_time = chainman.m_best_header->GetBlockTime(); } } LogPrintf("nBestHeight = %d\n", chain_active_height); |