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

TheBlueMatt · gmaxwell · commit 4c71fc42fbf3 · 2016-12-06T17:09:50.000Z
Github-Pull: bitcoin#8865 Rebased-From: 0278fb5
diff --git a/src/main.cpp b/src/main.cpp
@@ -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);
                             }

Original file line number	Diff line number	Diff line change
`@@ -3110,13 +3110,10 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,`
`3110`	`3110`	`}`
`3111`	`3111`	`}`
`3112`	`3112`	`// Relay inventory, but don't relay old inventory during initial block download.`
`3113`		`- int nBlockEstimate = 0;`
`3114`		`- if (fCheckpointsEnabled)`
`3115`		`- nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints());`
`3116`	`3113`	`{`
`3117`	`3114`	`LOCK(cs_vNodes);`
`3118`	`3115`	`BOOST_FOREACH(CNode* pnode, vNodes) {`
`3119`		`- if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {`
	`3116`	`+ if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {`
`3120`	`3117`	`BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {`
`3121`	`3118`	`pnode->PushBlockHash(hash);`
`3122`	`3119`	`}`