Merge pull request #2801 from karalabe/dao-hardfork-importdrop

karalabe · web-flow · commit 7596b33506d7 · 2016-07-12T15:22:13.000+03:00
eth/downloader: return invalid chain (peer drop) on import fails
diff --git a/eth/downloader/downloader.go b/eth/downloader/downloader.go
@@ -1859,7 +1859,7 @@ func (d *Downloader) processContent() error {
 			}
 			if err != nil {
 				glog.V(logger.Debug).Infof("Result #%d [%x…] processing failed: %v", results[index].Header.Number, results[index].Header.Hash().Bytes()[:4], err)
-				return err
+				return errInvalidChain
 			}
 			// Shift the results to the next batch
 			results = results[items:]

Original file line number	Diff line number	Diff line change
`@@ -1859,7 +1859,7 @@ func (d *Downloader) processContent() error {`
`1859`	`1859`	`}`
`1860`	`1860`	`if err != nil {`
`1861`	`1861`	`glog.V(logger.Debug).Infof("Result #%d [%x…] processing failed: %v", results[index].Header.Number, results[index].Header.Hash().Bytes()[:4], err)`
`1862`		`- return err`
	`1862`	`+ return errInvalidChain`
`1863`	`1863`	`}`
`1864`	`1864`	`// Shift the results to the next batch`
`1865`	`1865`	`results = results[items:]`