From 5cca45bb457b5b4df1dbae3af46b44301dae2dbe Mon Sep 17 00:00:00 2001
From: "M. J. Fromberger" <fromberger@interchain.io>
Date: Tue, 18 Jan 2022 14:32:22 -0800
Subject: [PATCH] pex: improve handling of closed channels (#7623)

Reverts and improves on #7622. The problem turns out not to be on the PEX
channel side, but on the pass-through (Go) channel.
---
 internal/p2p/pex/reactor.go | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/internal/p2p/pex/reactor.go b/internal/p2p/pex/reactor.go
index 2faa3130d..0c256a4f3 100644
--- a/internal/p2p/pex/reactor.go
+++ b/internal/p2p/pex/reactor.go
@@ -171,14 +171,10 @@ func (r *Reactor) processPexCh(ctx context.Context) {
 		defer close(incoming)
 		iter := r.pexCh.Receive(ctx)
 		for iter.Next(ctx) {
-			env := iter.Envelope()
-			if env == nil {
-				break
-			}
 			select {
 			case <-ctx.Done():
 				return
-			case incoming <- env:
+			case incoming <- iter.Envelope():
 			}
 		}
 	}()
@@ -198,7 +194,10 @@ func (r *Reactor) processPexCh(ctx context.Context) {
 			}
 		// inbound requests for new peers or responses to requests sent by this
 		// reactor
-		case envelope := <-incoming:
+		case envelope, ok := <-incoming:
+			if !ok {
+				return
+			}
 			duration, err = r.handleMessage(ctx, r.pexCh.ID, envelope)
 			if err != nil {
 				r.logger.Error("failed to process message", "ch_id", r.pexCh.ID, "envelope", envelope, "err", err)