Revert "eth/downloader: fix rare crash when parent header missing in db (ethereum#27945)"

devopsbo3 · web-flow · commit 03228ffe78de · 2023-11-10T12:27:53.000-06:00
This reverts commit a0330ad.
diff --git a/eth/downloader/skeleton.go b/eth/downloader/skeleton.go
@@ -648,7 +648,7 @@ func (s *skeleton) processNewHead(head *types.Header, final *types.Header, force
 	}
 	if parent := rawdb.ReadSkeletonHeader(s.db, number-1); parent.Hash() != head.ParentHash {
 		if force {
-			log.Warn("Beacon chain forked", "ancestor", number-1, "hash", parent.Hash(), "want", head.ParentHash)
+			log.Warn("Beacon chain forked", "ancestor", parent.Number, "hash", parent.Hash(), "want", head.ParentHash)
 		}
 		return true
 	}

Original file line number	Diff line number	Diff line change
`@@ -648,7 +648,7 @@ func (s skeleton) processNewHead(head types.Header, final *types.Header, force`
`648`	`648`	`}`
`649`	`649`	`if parent := rawdb.ReadSkeletonHeader(s.db, number-1); parent.Hash() != head.ParentHash {`
`650`	`650`	`if force {`
`651`		`- log.Warn("Beacon chain forked", "ancestor", number-1, "hash", parent.Hash(), "want", head.ParentHash)`
	`651`	`+ log.Warn("Beacon chain forked", "ancestor", parent.Number, "hash", parent.Hash(), "want", head.ParentHash)`
`652`	`652`	`}`
`653`	`653`	`return true`
`654`	`654`	`}`