core/state: fix eta calculation on pruning (#22386)

holiman · web-flow · commit 498458b4102c · 2021-02-26T16:33:37.000+01:00
diff --git a/core/state/pruner/pruner.go b/core/state/pruner/pruner.go
@@ -155,7 +155,7 @@ func prune(maindb ethdb.Database, stateBloom *stateBloom, middleStateRoots map[c
 			if done := binary.BigEndian.Uint64(key[:8]); done > 0 {
 				var (
 					left  = math.MaxUint64 - binary.BigEndian.Uint64(key[:8])
-					speed = done/uint64(time.Since(start)/time.Millisecond+1) + 1 // +1s to avoid division by zero
+					speed = done/uint64(time.Since(pstart)/time.Millisecond+1) + 1 // +1s to avoid division by zero
 				)
 				eta = time.Duration(left/speed) * time.Millisecond
 			}

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ func prune(maindb ethdb.Database, stateBloom *stateBloom, middleStateRoots map[c`
`155`	`155`	`if done := binary.BigEndian.Uint64(key[:8]); done > 0 {`
`156`	`156`	`var (`
`157`	`157`	`left = math.MaxUint64 - binary.BigEndian.Uint64(key[:8])`
`158`		`- speed = done/uint64(time.Since(start)/time.Millisecond+1) + 1 // +1s to avoid division by zero`
	`158`	`+ speed = done/uint64(time.Since(pstart)/time.Millisecond+1) + 1 // +1s to avoid division by zero`
`159`	`159`	`)`
`160`	`160`	`eta = time.Duration(left/speed) * time.Millisecond`
`161`	`161`	`}`