cmd/devp2p, cmd/wnode, whisper: add missing calls to Timer.Stop (ethe…

…reum#20843)
asanso · Apr 1, 2020 · 1e2e1b4 · 1e2e1b4
1 parent d56dc03
commit 1e2e1b4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/cmd/devp2p/crawl.go b/cmd/devp2p/crawl.go
@@ -63,6 +63,7 @@ func (c *crawler) run(timeout time.Duration) nodeSet {
 		doneCh       = make(chan enode.Iterator, len(c.iters))
 		liveIters    = len(c.iters)
 	)
+	defer timeoutTimer.Stop()
 	for _, it := range c.iters {
 		go c.runIterator(doneCh, it)
 	}

diff --git a/cmd/wnode/main.go b/cmd/wnode/main.go
@@ -599,6 +599,7 @@ func messageLoop() {
 	}
 
 	ticker := time.NewTicker(time.Millisecond * 50)
+	defer ticker.Stop()
 
 	for {
 		select {

diff --git a/whisper/whisperv6/whisper.go b/whisper/whisperv6/whisper.go
@@ -905,6 +905,7 @@ func (whisper *Whisper) update() {
 	defer whisper.wg.Done()
 	// Start a ticker to check for expirations
 	expire := time.NewTicker(expirationCycle)
+	defer expire.Stop()
 
 	// Repeat updates until termination is requested
 	for {
-Original file line number
+Diff line change
@@ Expand Up / @@ -599,6 +599,7 @@ func messageLoop() { @@
     	}
     	ticker := time.NewTicker(time.Millisecond * 50)
+    	defer ticker.Stop()
     	for {
     		select {
@@ Expand Down @@