make CloseWithError required for transport conns

Author: sukunrt

core/network/mux.go

@@ -124,6 +124,10 @@ type MuxedConn interface {
 	// Close closes the stream muxer and the the underlying net.Conn.
 	io.Closer
 
+	// CloseWithError closes the connection with errCode. The errCode is sent
+	// to the peer.
+	CloseWithError(errCode ConnErrorCode) error
+
 	// IsClosed returns whether a connection is fully closed, so it can
 	// be garbage collected.
 	IsClosed() bool
@@ -135,12 +139,6 @@ type MuxedConn interface {
 	AcceptStream() (MuxedStream, error)
 }
 
-type CloseWithErrorer interface {
-	// CloseWithError closes the connection with errCode. The errCode is sent
-	// to the peer.
-	CloseWithError(errCode ConnErrorCode) error
-}
-
 // Multiplexer wraps a net.Conn with a stream multiplexing
 // implementation and returns a MuxedConn that supports opening
 // multiple streams over the underlying net.Conn

p2p/net/swarm/swarm.go

@@ -385,12 +385,7 @@ func (s *Swarm) addConn(tc transport.CapableConn, dir network.Direction) (*Conn,
 	// If we do this in the Upgrader, we will not be able to do this.
 	if s.gater != nil {
 		if allow, _ := s.gater.InterceptUpgraded(c); !allow {
-			var err error
-			if tcc, ok := tc.(network.CloseWithErrorer); ok {
-				err = tcc.CloseWithError(network.ConnGated)
-			} else {
-				err = tc.Close()
-			}
+			err := tc.CloseWithError(network.ConnGated)
 			if err != nil {
 				log.Warnf("failed to close connection with peer %s and addr %s; err: %s", p, addr, err)
 			}
@@ -852,10 +847,7 @@ func (c *connWithMetrics) Close() error {
 func (c *connWithMetrics) CloseWithError(errCode network.ConnErrorCode) error {
 	c.once.Do(func() {
 		c.metricsTracer.ClosedConnection(c.dir, time.Since(c.opened), c.ConnState(), c.LocalMultiaddr())
-		if ce, ok := c.CapableConn.(network.CloseWithErrorer); ok {
-			c.closeErr = ce.CloseWithError(errCode)
-		}
-		c.closeErr = c.CapableConn.Close()
+		c.closeErr = c.CapableConn.CloseWithError(errCode)
 	})
 	return c.closeErr
 }

p2p/net/swarm/swarm_conn.go

@@ -81,11 +81,7 @@ func (c *Conn) doClose(errCode network.ConnErrorCode) {
 	c.streams.Unlock()
 
 	if errCode != 0 {
-		if ce, ok := c.conn.(network.CloseWithErrorer); ok {
-			c.err = ce.CloseWithError(errCode)
-		} else {
-			c.err = c.conn.Close()
-		}
+		c.err = c.conn.CloseWithError(errCode)
 	} else {
 		c.err = c.conn.Close()
 	}

p2p/net/upgrader/conn.go

@@ -66,8 +66,5 @@ func (t *transportConn) ConnState() network.ConnectionState {
 
 func (t *transportConn) CloseWithError(errCode network.ConnErrorCode) error {
 	defer t.scope.Done()
-	if ce, ok := t.MuxedConn.(network.CloseWithErrorer); ok {
-		return ce.CloseWithError(errCode)
-	}
-	return t.Close()
+	return t.MuxedConn.CloseWithError(errCode)
 }

p2p/net/upgrader/listener.go

@@ -162,11 +162,7 @@ func (l *listener) handleIncoming() {
 				// if we stop accepting connections for some reason,
 				// we'll eventually close all the open ones
 				// instead of hanging onto them.
-				if cc, ok := conn.(network.CloseWithErrorer); ok {
-					cc.CloseWithError(network.ConnRateLimited)
-				} else {
-					conn.Close()
-				}
+				conn.CloseWithError(network.ConnRateLimited)
 			}
 		}()
 	}

p2p/transport/quic/virtuallistener.go

@@ -143,7 +143,7 @@ func (r *acceptLoopRunner) innerAccept(l *listener, expectedVersion quic.Version
 	select {
 	case ch <- acceptVal{conn: conn}:
 	default:
-		conn.(network.CloseWithErrorer).CloseWithError(network.ConnRateLimited)
+		conn.CloseWithError(network.ConnRateLimited)
 		// accept queue filled up, drop the connection
 		log.Warn("Accept queue filled. Dropping connection.")
 	}

p2p/transport/websocket/conn.go

@@ -203,11 +203,3 @@ func (c *capableConn) ConnState() network.ConnectionState {
 	cs.Transport = "websocket"
 	return cs
 }
-
-// CloseWithError implements network.CloseWithErrorer
-func (c *capableConn) CloseWithError(errCode network.ConnErrorCode) error {
-	if ce, ok := c.CapableConn.(network.CloseWithErrorer); ok {
-		return ce.CloseWithError(errCode)
-	}
-	return c.Close()
-}