fix transport integration test

libp2p · Mar 6, 2024 · 4fb66c5 · 4fb66c5
1 parent 3832d79
commit 4fb66c5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/p2p/transport/webrtc/connection.go b/p2p/transport/webrtc/connection.go
@@ -175,7 +175,7 @@ func (c *connection) AcceptStream() (network.MuxedStream, error) {
 	case <-c.ctx.Done():
 		return nil, c.closeErr
 	case dc := <-c.acceptQueue:
-		str := newStream(dc.channel, dc.stream, maxRTT,func() { c.removeStream(*dc.channel.ID()) }, c.onDataChannelClose)
+		str := newStream(dc.channel, dc.stream, maxRTT, func() { c.removeStream(*dc.channel.ID()) }, c.onDataChannelClose)
 		if err := c.addStream(str); err != nil {
 			str.Reset()
 			return nil, err
@@ -215,6 +215,7 @@ func (c *connection) onDataChannelClose(remoteClosed bool) {
 	if !remoteClosed {
 		if c.invalidDataChannelClosures.Add(1) > maxInvalidDataChannelClosures {
 			c.closeOnce.Do(func() {
+				log.Error("closing connection as peer is not closing datachannels: ", c.RemotePeer(), c.RemoteMultiaddr())
 				c.closeWithError(errors.New("peer is not closing datachannels"))
 			})
 		}

diff --git a/p2p/transport/webrtc/stream.go b/p2p/transport/webrtc/stream.go
@@ -257,7 +257,7 @@ func (s *stream) spawnControlMessageReader() {
 				}
 
 				// The stream is closed. Wait for 1RTT before erroring
-				if s.isClosed && endTime.IsZero() {
+				if s.sendState == sendStateDataSent && endTime.IsZero() {
 					endTime = time.Now().Add(s.rtt)
 				}
 				s.setDataChannelReadDeadline(endTime)