ping: simplify ping loop

libp2p · May 7, 2019 · d0ab451 · d0ab451
1 parent d3d5351
commit d0ab451
Showing 1 changed file with 15 additions and 20 deletions.
diff --git a/p2p/protocol/ping/ping.go b/p2p/protocol/ping/ping.go
@@ -99,29 +99,24 @@ func Ping(ctx context.Context, h host.Host, p peer.ID) <-chan Result {
 		defer close(out)
 		defer cancel()
 
-		for {
+		for ctx.Err() == nil {
+			var res Result
+			res.RTT, res.Error = ping(s)
+
+			// canceled, ignore everything.
+			if ctx.Err() != nil {
+				return
+			}
+
+			// No error, record the RTT.
+			if res.Error == nil {
+				h.Peerstore().RecordLatency(p, res.RTT)
+			}
+
 			select {
+			case out <- res:
 			case <-ctx.Done():
 				return
-			default:
-				var res Result
-				res.RTT, res.Error = ping(s)
-
-				// canceled, ignore everything.
-				if ctx.Err() != nil {
-					return
-				}
-
-				// No error, record the RTT.
-				if res.Error == nil {
-					h.Peerstore().RecordLatency(p, res.RTT)
-				}
-
-				select {
-				case out <- res:
-				case <-ctx.Done():
-					return
-				}
 			}
 		}
 	}()