Skip to content

init: clean up load chainstate function #240

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Ataraxia009 wants to merge 1 commit into
base: 29.x-knots
Choose a base branch
from
Open

init: clean up load chainstate function #240

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions src/validation.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5039,16 +5039,16 @@ void PruneBlockFilesManual(Chainstate& active_chainstate, int nManualPruneHeight
bool Chainstate::LoadChainTip()
{
AssertLockHeld(cs_main);
const CCoinsViewCache& coins_cache = CoinsTip();
assert(!coins_cache.GetBestBlock().IsNull()); // Never called when the coins view is empty
uint256 coins_view_best_block_hash = CoinsTip().GetBestBlock();
assert(!coins_view_best_block_hash.IsNull()); // Never called when the coins view is empty
CBlockIndex* tip = m_chain.Tip();

if (tip && tip->GetBlockHash() == coins_cache.GetBestBlock()) {
if (tip && tip->GetBlockHash() == coins_view_best_block_hash) {
return true;
}

// Load pointer to end of best chain
CBlockIndex* pindex = m_blockman.LookupBlockIndex(coins_cache.GetBestBlock());
CBlockIndex* pindex = m_blockman.LookupBlockIndex(coins_view_best_block_hash);
if (!pindex) {
return false;
}
Expand All @@ -5067,8 +5067,7 @@ bool Chainstate::LoadChainTip()
}
PruneBlockIndexCandidates();

tip = m_chain.Tip();
LogPrintf("Loaded best chain: hashBestChain=%s height=%d date=%s progress=%f\n",
LogInfo("Loaded best chain: hashBestChain=%s height=%d date=%s progress=%f",
tip->GetBlockHash().ToString(),
m_chain.Height(),
FormatISO8601DateTime(tip->GetBlockTime()),
Expand Down