Merge pull request #21472 from holiman/fix_dltest_fail

karalabe · web-flow · commit b68929caee77 · 2020-08-21T14:43:14.000+03:00
eth/downloader: fix rollback issue on short chains
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
@@ -1502,6 +1502,8 @@ func (d *Downloader) processHeaders(origin uint64, pivot uint64, td *big.Int) er
 					head := chunk[len(chunk)-1].Number.Uint64()
 					if head-rollback > uint64(fsHeaderSafetyNet) {
 						rollback = head - uint64(fsHeaderSafetyNet)
+					} else {
+						rollback = 1
 					}
 				}
 				// Unless we're doing light chains, schedule the headers for associated content retrieval

Original file line number	Diff line number	Diff line change
`@@ -1502,6 +1502,8 @@ func (d Downloader) processHeaders(origin uint64, pivot uint64, td big.Int) er`
`1502`	`1502`	`head := chunk[len(chunk)-1].Number.Uint64()`
`1503`	`1503`	`if head-rollback > uint64(fsHeaderSafetyNet) {`
`1504`	`1504`	`rollback = head - uint64(fsHeaderSafetyNet)`
	`1505`	`+ } else {`
	`1506`	`+ rollback = 1`
`1505`	`1507`	`}`
`1506`	`1508`	`}`
`1507`	`1509`	`// Unless we're doing light chains, schedule the headers for associated content retrieval`