remove unused version parameter from stream constructor

This commit is contained in:
Marten Seemann
2022-12-24 12:50:31 +13:00
parent 0f352f2653
commit d972a5e8f2
3 changed files with 4 additions and 7 deletions

View File

@@ -80,8 +80,6 @@ type stream struct {
sender streamSender sender streamSender
receiveStreamCompleted bool receiveStreamCompleted bool
sendStreamCompleted bool sendStreamCompleted bool
version protocol.VersionNumber
} }
var _ Stream = &stream{} var _ Stream = &stream{}
@@ -90,9 +88,8 @@ var _ Stream = &stream{}
func newStream(streamID protocol.StreamID, func newStream(streamID protocol.StreamID,
sender streamSender, sender streamSender,
flowController flowcontrol.StreamFlowController, flowController flowcontrol.StreamFlowController,
version protocol.VersionNumber,
) *stream { ) *stream {
s := &stream{sender: sender, version: version} s := &stream{sender: sender}
senderForSendStream := &uniStreamSender{ senderForSendStream := &uniStreamSender{
streamSender: sender, streamSender: sender,
onStreamCompletedImpl: func() { onStreamCompletedImpl: func() {

View File

@@ -40,7 +40,7 @@ var _ = Describe("Stream", func() {
BeforeEach(func() { BeforeEach(func() {
mockSender = NewMockStreamSender(mockCtrl) mockSender = NewMockStreamSender(mockCtrl)
mockFC = mocks.NewMockStreamFlowController(mockCtrl) mockFC = mocks.NewMockStreamFlowController(mockCtrl)
str = newStream(streamID, mockSender, mockFC, protocol.VersionWhatever) str = newStream(streamID, mockSender, mockFC)
timeout := scaleDuration(250 * time.Millisecond) timeout := scaleDuration(250 * time.Millisecond)
strWithTimeout = struct { strWithTimeout = struct {

View File

@@ -89,7 +89,7 @@ func (m *streamsMap) initMaps() {
protocol.StreamTypeBidi, protocol.StreamTypeBidi,
func(num protocol.StreamNum) streamI { func(num protocol.StreamNum) streamI {
id := num.StreamID(protocol.StreamTypeBidi, m.perspective) id := num.StreamID(protocol.StreamTypeBidi, m.perspective)
return newStream(id, m.sender, m.newFlowController(id), m.version) return newStream(id, m.sender, m.newFlowController(id))
}, },
m.sender.queueControlFrame, m.sender.queueControlFrame,
) )
@@ -97,7 +97,7 @@ func (m *streamsMap) initMaps() {
protocol.StreamTypeBidi, protocol.StreamTypeBidi,
func(num protocol.StreamNum) streamI { func(num protocol.StreamNum) streamI {
id := num.StreamID(protocol.StreamTypeBidi, m.perspective.Opposite()) id := num.StreamID(protocol.StreamTypeBidi, m.perspective.Opposite())
return newStream(id, m.sender, m.newFlowController(id), m.version) return newStream(id, m.sender, m.newFlowController(id))
}, },
m.maxIncomingBidiStreams, m.maxIncomingBidiStreams,
m.sender.queueControlFrame, m.sender.queueControlFrame,