nits

libp2p · Feb 21, 2025 · 402b274 · 402b274
1 parent e75c7e3
commit 402b274
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/p2p/transport/webrtc/transport.go b/p2p/transport/webrtc/transport.go
@@ -233,7 +233,7 @@ func (t *WebRTCTransport) listenSocket(socket net.PacketConn) (tpt.Listener, err
 	if err != nil {
 		return nil, err
 	}
-	listenerMultiaddr = listenerMultiaddr.EncapsulateC(webrtcComponent).EncapsulateC(certComp)
+	listenerMultiaddr = append(listenerMultiaddr, webrtcComponent, certComp)
 
 	return newListener(
 		t,
@@ -531,7 +531,7 @@ func (t *WebRTCTransport) AddCertHashes(addr ma.Multiaddr) (ma.Multiaddr, bool)
 	if err != nil {
 		return nil, false
 	}
-	return addr.EncapsulateC(certComp), true
+	return append(addr, certComp), true
 }
 
 type netConnWrapper struct {

diff --git a/p2p/transport/websocket/listener.go b/p2p/transport/websocket/listener.go
@@ -40,14 +40,14 @@ type listener struct {
 
 func (pwma *parsedWebsocketMultiaddr) toMultiaddr() ma.Multiaddr {
 	if !pwma.isWSS {
-		return pwma.restMultiaddr.EncapsulateC(wsComponent)
+		return append(pwma.restMultiaddr, wsComponent)
 	}
 
 	if pwma.sni.Empty() {
-		return pwma.restMultiaddr.EncapsulateC(tlsComponent).EncapsulateC(wsComponent)
+		return append(pwma.restMultiaddr, tlsComponent, wsComponent)
 	}
 
-	return pwma.restMultiaddr.EncapsulateC(tlsComponent).EncapsulateC(pwma.sni).EncapsulateC(wsComponent)
+	return append(append(pwma.restMultiaddr, tlsComponent), pwma.sni, wsComponent...)
 }
 
 // newListener creates a new listener from a raw net.Listener.

diff --git a/p2p/transport/webtransport/transport_test.go b/p2p/transport/webtransport/transport_test.go
@@ -593,10 +593,6 @@ func TestFlowControlWindowIncrease(t *testing.T) {
 			addr = addr.Encapsulate(ma.StringCast(fmt.Sprintf("/udp/%d", proxy.LocalPort())))
 			continue
 		}
-		if addr == nil {
-			addr = append(addr, comp)
-			continue
-		}
 		addr = append(addr, comp)
 	}