From 2fb42afc8a46b7522f259c12578c601f9243865f Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Sun, 15 May 2016 18:49:01 +0200 Subject: [PATCH] privatize session.queueStreamFrame ref #60 --- session.go | 4 ++-- session_test.go | 24 ++++++++++++------------ stream.go | 6 +++--- stream_test.go | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/session.go b/session.go index 5544374e..a9897662 100644 --- a/session.go +++ b/session.go @@ -523,8 +523,8 @@ func (s *Session) sendPacket() error { return nil } -// QueueStreamFrame queues a frame for sending to the client -func (s *Session) QueueStreamFrame(frame *frames.StreamFrame) error { +// queueStreamFrame queues a frame for sending to the client +func (s *Session) queueStreamFrame(frame *frames.StreamFrame) error { s.packer.AddStreamFrame(*frame) s.scheduleSending() return nil diff --git a/session_test.go b/session_test.go index 967e93e3..11f3c507 100644 --- a/session_test.go +++ b/session_test.go @@ -362,7 +362,7 @@ var _ = Describe("Session", func() { }) It("sends queued stream frames", func() { - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 1, Data: []byte("foobar"), }) @@ -420,10 +420,10 @@ var _ = Describe("Session", func() { It("sends after queuing a stream frame", func() { Expect(session.sendingScheduled).NotTo(Receive()) - err := session.QueueStreamFrame(&frames.StreamFrame{StreamID: 1}) + err := session.queueStreamFrame(&frames.StreamFrame{StreamID: 1}) Expect(err).ToNot(HaveOccurred()) // Try again, so that we detect blocking scheduleSending - err = session.QueueStreamFrame(&frames.StreamFrame{StreamID: 1}) + err = session.queueStreamFrame(&frames.StreamFrame{StreamID: 1}) Expect(err).ToNot(HaveOccurred()) Expect(session.sendingScheduled).To(Receive()) }) @@ -445,11 +445,11 @@ var _ = Describe("Session", func() { It("bundles two small frames into one packet", func() { go session.Run() - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: []byte("foobar1"), }) - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: []byte("foobar2"), }) @@ -460,11 +460,11 @@ var _ = Describe("Session", func() { It("sends out two big frames in two packet", func() { go session.Run() - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: bytes.Repeat([]byte{'e'}, int(protocol.SmallPacketPayloadSizeThreshold+50)), }) - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: bytes.Repeat([]byte{'f'}, int(protocol.SmallPacketPayloadSizeThreshold+50)), }) @@ -475,12 +475,12 @@ var _ = Describe("Session", func() { It("sends out two small frames that are written to long after one another into two packet", func() { go session.Run() - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: []byte("foobar1"), }) time.Sleep(10 * protocol.SmallPacketSendDelay) - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: []byte("foobar2"), }) @@ -493,12 +493,12 @@ var _ = Describe("Session", func() { packetNumber := protocol.PacketNumber(0x1337) session.receivedPacketHandler.ReceivedPacket(packetNumber, true) - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: []byte("foobar1"), }) time.Sleep(10 * protocol.SmallPacketSendDelay) - session.QueueStreamFrame(&frames.StreamFrame{ + session.queueStreamFrame(&frames.StreamFrame{ StreamID: 5, Data: []byte("foobar2"), }) @@ -589,7 +589,7 @@ var _ = Describe("Session", func() { }) It("should call OnSent", func() { - session.QueueStreamFrame(&frames.StreamFrame{StreamID: 5}) + session.queueStreamFrame(&frames.StreamFrame{StreamID: 5}) session.sendPacket() Expect(cong.nCalls).To(Equal(2)) // OnPacketSent + GetCongestionWindow Expect(cong.argsOnPacketSent[1]).To(Equal(protocol.ByteCount(25))) diff --git a/stream.go b/stream.go index 0235c2f1..854baa16 100644 --- a/stream.go +++ b/stream.go @@ -12,7 +12,7 @@ import ( ) type streamHandler interface { - QueueStreamFrame(*frames.StreamFrame) error + queueStreamFrame(*frames.StreamFrame) error UpdateReceiveFlowControlWindow(streamID protocol.StreamID, byteOffset protocol.ByteCount) error } @@ -180,7 +180,7 @@ func (s *stream) Write(p []byte) (int, error) { dataLen := utils.Min(len(p), int(remainingBytesInWindow)) data := make([]byte, dataLen) copy(data, p) - err := s.session.QueueStreamFrame(&frames.StreamFrame{ + err := s.session.queueStreamFrame(&frames.StreamFrame{ StreamID: s.streamID, Offset: s.writeOffset, Data: data, @@ -199,7 +199,7 @@ func (s *stream) Write(p []byte) (int, error) { // Close implements io.Closer func (s *stream) Close() error { atomic.StoreInt32(&s.closed, 1) - return s.session.QueueStreamFrame(&frames.StreamFrame{ + return s.session.queueStreamFrame(&frames.StreamFrame{ StreamID: s.streamID, Offset: s.writeOffset, FinBit: true, diff --git a/stream_test.go b/stream_test.go index ef901960..a10743aa 100644 --- a/stream_test.go +++ b/stream_test.go @@ -17,7 +17,7 @@ type mockStreamHandler struct { frames []frames.Frame } -func (m *mockStreamHandler) QueueStreamFrame(f *frames.StreamFrame) error { +func (m *mockStreamHandler) queueStreamFrame(f *frames.StreamFrame) error { m.frames = append(m.frames, f) return nil }