Skip to content

Commit f517337

Browse files
authored
fix: stream reseting before closing connection (#71)
1 parent f0bb038 commit f517337

File tree

3 files changed

+1
-15
lines changed

3 files changed

+1
-15
lines changed

comm/p2p/libp2p.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -188,15 +188,6 @@ func (c Libp2pCommunication) sendMessage(
188188
if err != nil {
189189
c.logger.Error().Str("To", to.String()).Err(err).Msg("unable to send message")
190190
c.streamManager.ReleaseStreams(sessionID)
191-
192-
stream, err = c.streamManager.Stream(sessionID, to, c.protocolID)
193-
if err != nil {
194-
return err
195-
}
196-
197-
err = WriteStream(msg, bufio.NewWriterSize(stream, defaultBufferSize))
198-
}
199-
if err != nil {
200191
return err
201192
}
202193

comm/p2p/manager.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,10 @@ func (sm *StreamManager) ReleaseStreams(sessionID string) {
4343
}
4444

4545
for peer, stream := range streams {
46-
if stream.Conn() != nil {
47-
_ = stream.Conn().Close()
48-
}
49-
5046
err := stream.Close()
5147
if err != nil {
5248
log.Debug().Msgf("Cannot close stream to peer %s, err: %s", peer.String(), err.Error())
49+
_ = stream.Reset()
5350
}
5451
}
5552

comm/p2p/manager_test.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ func (s *StreamManagerTestSuite) Test_ManagingSubscriptions_Success() {
3535
streamManager := p2p.NewStreamManager(s.mockHost)
3636

3737
mockConn := mock_network.NewMockConn(s.mockController)
38-
mockConn.EXPECT().Close().Return(nil).Times(2)
39-
4038
stream1 := mock_network.NewMockStream(s.mockController)
4139
stream1.EXPECT().Conn().Return(mockConn).AnyTimes()
4240
stream2 := mock_network.NewMockStream(s.mockController)

0 commit comments

Comments
 (0)