simplify accepting new connections

libp2p · Oct 27, 2017 · 1820ac9 · 1820ac9
1 parent b2606fa
commit 1820ac9
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/listen.go b/listen.go
@@ -2,7 +2,6 @@ package conn
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"io"
 	"net"
@@ -91,13 +90,11 @@ func (l *listener) Accept() (iconn.Conn, error) {
 		log.Warningf("listener %s listening INSECURELY!", l)
 	}
 
-	for c := range l.incoming {
-		if c.err != nil {
-			return nil, c.err
-		}
-		return c.conn, nil
+	c, ok := <-l.incoming
+	if !ok {
+		return nil, fmt.Errorf("listener is closed")
 	}
-	return nil, errors.New("listener is closed")
+	return c.conn, c.err
 }
 
 func (l *listener) Addr() net.Addr {