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

TheBlueMatt · TheBlueMatt · commit 0278fb5f48ae · 2016-10-04T12:35:07.000-04:00
diff --git a/src/main.cpp b/src/main.cpp
@@ -3087,12 +3087,9 @@ 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());
                 if(connman) {
-                    connman->ForEachNode([nNewHeight, nBlockEstimate, &vHashes](CNode* pnode) {
-                        if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {
+                    connman->ForEachNode([nNewHeight, &vHashes](CNode* pnode) {
+                        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
`@@ -3087,12 +3087,9 @@ bool ActivateBestChain(CValidationState &state, const CChainParams& chainparams,`
`3087`	`3087`	`}`
`3088`	`3088`	`}`
`3089`	`3089`	`// Relay inventory, but don't relay old inventory during initial block download.`
`3090`		`- int nBlockEstimate = 0;`
`3091`		`- if (fCheckpointsEnabled)`
`3092`		`- nBlockEstimate = Checkpoints::GetTotalBlocksEstimate(chainparams.Checkpoints());`
`3093`	`3090`	`if(connman) {`
`3094`		`- connman->ForEachNode([nNewHeight, nBlockEstimate, &vHashes](CNode* pnode) {`
`3095`		`- if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : nBlockEstimate)) {`
	`3091`	`+ connman->ForEachNode([nNewHeight, &vHashes](CNode* pnode) {`
	`3092`	`+ if (nNewHeight > (pnode->nStartingHeight != -1 ? pnode->nStartingHeight - 2000 : 0)) {`
`3096`	`3093`	`BOOST_REVERSE_FOREACH(const uint256& hash, vHashes) {`
`3097`	`3094`	`pnode->PushBlockHash(hash);`
`3098`	`3095`	`}`