Use better calculation for top block

zquestz · zquestz · commit 65435914ce87 · 2020-09-06T15:06:06.000-10:00
diff --git a/netsync/manager.go b/netsync/manager.go
@@ -571,7 +571,12 @@ func (sm *SyncManager) medianSyncPeerCandidateBlockHeight() int32 {
 			continue
 		}
 
-		heights = append(heights, peer.LastBlock())
+		topBlock := peer.LastBlock()
+		if topBlock < peer.StartingHeight() {
+			topBlock = peer.StartingHeight()
+		}
+
+		heights = append(heights, topBlock)
 	}
 
 	// If we don't have any sync peer candidate heights, return 0.

Original file line number	Diff line number	Diff line change
`@@ -571,7 +571,12 @@ func (sm *SyncManager) medianSyncPeerCandidateBlockHeight() int32 {`
`571`	`571`	`continue`
`572`	`572`	`}`
`573`	`573`
`574`		`- heights = append(heights, peer.LastBlock())`
	`574`	`+ topBlock := peer.LastBlock()`
	`575`	`+ if topBlock < peer.StartingHeight() {`
	`576`	`+ topBlock = peer.StartingHeight()`
	`577`	`+ }`
	`578`	`+`
	`579`	`+ heights = append(heights, topBlock)`
`575`	`580`	`}`
`576`	`581`
`577`	`582`	`// If we don't have any sync peer candidate heights, return 0.`