rename sendStream.handleMaxStreamDataFrame to updateSendWindow

daeuniverse · Mar 12, 2021 · c27f5a5 · c27f5a5
1 parent 3bce408
commit c27f5a5
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 40 deletions.
diff --git a/mock_send_stream_internal_test.go b/mock_send_stream_internal_test.go
diff --git a/mock_stream_internal_test.go b/mock_stream_internal_test.go
diff --git a/send_stream.go b/send_stream.go
@@ -20,7 +20,7 @@ type sendStreamI interface {
 	hasData() bool
 	popStreamFrame(maxBytes protocol.ByteCount) (*ackhandler.Frame, bool)
 	closeForShutdown(error)
-	handleMaxStreamDataFrame(*wire.MaxStreamDataFrame)
+	updateSendWindow(protocol.ByteCount)
 }
 
 type sendStream struct {
@@ -437,12 +437,12 @@ func (s *sendStream) cancelWriteImpl(errorCode protocol.ApplicationErrorCode, wr
 	}
 }
 
-func (s *sendStream) handleMaxStreamDataFrame(frame *wire.MaxStreamDataFrame) {
+func (s *sendStream) updateSendWindow(limit protocol.ByteCount) {
 	s.mutex.Lock()
 	hasStreamData := s.dataForWriting != nil || s.nextFrame != nil
 	s.mutex.Unlock()
 
-	s.flowController.UpdateSendWindow(frame.MaximumStreamData)
+	s.flowController.UpdateSendWindow(limit)
 	if hasStreamData {
 		s.sender.onHasStreamData(s.streamID)
 	}

diff --git a/send_stream_test.go b/send_stream_test.go
@@ -652,10 +652,7 @@ var _ = Describe("Send Stream", func() {
 	Context("handling MAX_STREAM_DATA frames", func() {
 		It("informs the flow controller", func() {
 			mockFC.EXPECT().UpdateSendWindow(protocol.ByteCount(0x1337))
-			str.handleMaxStreamDataFrame(&wire.MaxStreamDataFrame{
-				StreamID:          streamID,
-				MaximumStreamData: 0x1337,
-			})
+			str.updateSendWindow(0x1337)
 		})
 
 		It("says when it has data for sending", func() {
@@ -670,10 +667,7 @@ var _ = Describe("Send Stream", func() {
 			}()
 			waitForWrite()
 			mockSender.EXPECT().onHasStreamData(streamID)
-			str.handleMaxStreamDataFrame(&wire.MaxStreamDataFrame{
-				StreamID:          streamID,
-				MaximumStreamData: 42,
-			})
+			str.updateSendWindow(42)
 			// make sure the Write go routine returns
 			str.closeForShutdown(nil)
 			Eventually(done).Should(BeClosed())

diff --git a/session.go b/session.go
@@ -1272,7 +1272,7 @@ func (s *session) handleMaxStreamDataFrame(frame *wire.MaxStreamDataFrame) error
 		// stream is closed and already garbage collected
 		return nil
 	}
-	str.handleMaxStreamDataFrame(frame)
+	str.updateSendWindow(frame.MaximumStreamData)
 	return nil
 }
 

diff --git a/session_test.go b/session_test.go
@@ -220,9 +220,8 @@ var _ = Describe("Session", func() {
 				}
 				str := NewMockSendStreamI(mockCtrl)
 				streamManager.EXPECT().GetOrOpenSendStream(protocol.StreamID(12345)).Return(str, nil)
-				str.EXPECT().handleMaxStreamDataFrame(f)
-				err := sess.handleMaxStreamDataFrame(f)
-				Expect(err).ToNot(HaveOccurred())
+				str.EXPECT().updateSendWindow(protocol.ByteCount(0x1337))
+				Expect(sess.handleMaxStreamDataFrame(f)).To(Succeed())
 			})
 
 			It("updates the flow control window of the connection", func() {

diff --git a/stream.go b/stream.go
@@ -61,7 +61,7 @@ type streamI interface {
 	hasData() bool
 	handleStopSendingFrame(*wire.StopSendingFrame)
 	popStreamFrame(maxBytes protocol.ByteCount) (*ackhandler.Frame, bool)
-	handleMaxStreamDataFrame(*wire.MaxStreamDataFrame)
+	updateSendWindow(protocol.ByteCount)
 }
 
 var (