Permalink
Browse files

Remove duplicate nBlocksEstimate cmp (we already checked IsIBD())

Github-Pull: #8865
Rebased-From: 0278fb5
  • Loading branch information...
1 parent 0a4aa87 commit 4c71fc42fbf32d8994f4d2488ac4bafad93226a1 @TheBlueMatt TheBlueMatt committed with gmaxwell Sep 30, 2016
Showing with 1 addition and 4 deletions.
  1. +1 −4 src/main.cpp
View
@@ -3110,13 +3110,10 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,
}
}
// Relay inventory, but don't relay old inventory during initial block download.
- int nBlockEstimate = 0;
- if (fCheckpointsEnabled)
- nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints());
{
LOCK(cs_vNodes);
BOOST_FOREACH(CNode* pnode, vNodes) {
- if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {
+ if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {
BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {
pnode->PushBlockHash(hash);
}

0 comments on commit 4c71fc4

Please sign in to comment.