eth/fetcher: avoid spurious timer events at startup (ethereum#22652)

Co-authored-by: Felix Lange <[email protected]>
frozeman · Oct 15, 2021 · 0d42d32 · 0d42d32
1 parent 16dd0d8
commit 0d42d32
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/eth/fetcher/block_fetcher.go b/eth/fetcher/block_fetcher.go
@@ -331,8 +331,12 @@ func (f *BlockFetcher) FilterBodies(peer string, transactions [][]*types.Transac
 // events.
 func (f *BlockFetcher) loop() {
 	// Iterate the block fetching until a quit is requested
-	fetchTimer := time.NewTimer(0)
-	completeTimer := time.NewTimer(0)
+	var (
+		fetchTimer    = time.NewTimer(0)
+		completeTimer = time.NewTimer(0)
+	)
+	<-fetchTimer.C // clear out the channel
+	<-completeTimer.C
 	defer fetchTimer.Stop()
 	defer completeTimer.Stop()