From 0f352f2653b533c14726b27318212aeef5183cd0 Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Sat, 24 Dec 2022 12:49:05 +1300 Subject: [PATCH] remove unused version parameter from receive stream constructor --- receive_stream.go | 3 --- receive_stream_test.go | 2 +- stream.go | 2 +- streams_map.go | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/receive_stream.go b/receive_stream.go index ae6a449b5..dda018053 100644 --- a/receive_stream.go +++ b/receive_stream.go @@ -51,7 +51,6 @@ type receiveStream struct { deadline time.Time flowController flowcontrol.StreamFlowController - version protocol.VersionNumber } var ( @@ -63,7 +62,6 @@ func newReceiveStream( streamID protocol.StreamID, sender streamSender, flowController flowcontrol.StreamFlowController, - version protocol.VersionNumber, ) *receiveStream { return &receiveStream{ streamID: streamID, @@ -73,7 +71,6 @@ func newReceiveStream( readChan: make(chan struct{}, 1), readOnce: make(chan struct{}, 1), finalOffset: protocol.MaxByteCount, - version: version, } } diff --git a/receive_stream_test.go b/receive_stream_test.go index 4509e05a9..d0105af98 100644 --- a/receive_stream_test.go +++ b/receive_stream_test.go @@ -31,7 +31,7 @@ var _ = Describe("Receive Stream", func() { BeforeEach(func() { mockSender = NewMockStreamSender(mockCtrl) mockFC = mocks.NewMockStreamFlowController(mockCtrl) - str = newReceiveStream(streamID, mockSender, mockFC, protocol.VersionWhatever) + str = newReceiveStream(streamID, mockSender, mockFC) timeout := scaleDuration(250 * time.Millisecond) strWithTimeout = gbytes.TimeoutReader(str, timeout) diff --git a/stream.go b/stream.go index 09e8ca6d6..2a4d55b86 100644 --- a/stream.go +++ b/stream.go @@ -112,7 +112,7 @@ func newStream(streamID protocol.StreamID, s.completedMutex.Unlock() }, } - s.receiveStream = *newReceiveStream(streamID, senderForReceiveStream, flowController, version) + s.receiveStream = *newReceiveStream(streamID, senderForReceiveStream, flowController) return s } diff --git a/streams_map.go b/streams_map.go index c938b5ba5..35e1aba1e 100644 --- a/streams_map.go +++ b/streams_map.go @@ -114,7 +114,7 @@ func (m *streamsMap) initMaps() { protocol.StreamTypeUni, func(num protocol.StreamNum) receiveStreamI { id := num.StreamID(protocol.StreamTypeUni, m.perspective.Opposite()) - return newReceiveStream(id, m.sender, m.newFlowController(id), m.version) + return newReceiveStream(id, m.sender, m.newFlowController(id)) }, m.maxIncomingUniStreams, m.sender.queueControlFrame,