core/state/snapshot: print correct error from trie iterator (#28560)

rjl493456442 · web-flow · commit 661bd451887e · 2023-11-21T10:47:37.000+08:00
diff --git a/core/state/snapshot/generate.go b/core/state/snapshot/generate.go
@@ -446,7 +446,7 @@ func (dl *diskLayer) generateRange(ctx *generatorContext, trieId *trie.ID, prefi
 		// Trie errors should never happen. Still, in case of a bug, expose the
 		// error here, as the outer code will presume errors are interrupts, not
 		// some deeper issues.
-		log.Error("State snapshotter failed to iterate trie", "err", err)
+		log.Error("State snapshotter failed to iterate trie", "err", iter.Err)
 		return false, nil, iter.Err
 	}
 	// Delete all stale snapshot states remaining

Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ func (dl diskLayer) generateRange(ctx generatorContext, trieId *trie.ID, prefi`
`446`	`446`	`// Trie errors should never happen. Still, in case of a bug, expose the`
`447`	`447`	`// error here, as the outer code will presume errors are interrupts, not`
`448`	`448`	`// some deeper issues.`
`449`		`- log.Error("State snapshotter failed to iterate trie", "err", err)`
	`449`	`+ log.Error("State snapshotter failed to iterate trie", "err", iter.Err)`
`450`	`450`	`return false, nil, iter.Err`
`451`	`451`	`}`
`452`	`452`	`// Delete all stale snapshot states remaining`