gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #1925 from lucas-clemente/remove-getoropenstream

Browse Source 
remove unused Session.GetOrOpenStream
This commit is contained in:
Marten Seemann
2019-05-29 10:30:15 +01:00
committed by GitHub
parent ba8a122680 2f4fc22be1
commit 5009f1cb19
2 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
session.go
View File

@@ -1159,21 +1159,6 @@ func (s *session) logPacket(packet *packedPacket) {
} }
} }
// GetOrOpenStream either returns an existing stream, a newly opened stream, or nil if a stream with the provided ID is already closed.
// It is *only* needed for gQUIC's H2.
// It will be removed as soon as gQUIC moves towards the IETF H2/QUIC stream mapping.
func (s *session) GetOrOpenStream(id protocol.StreamID) (Stream, error) {
str, err := s.streamsMap.GetOrOpenSendStream(id)
if str != nil {
if bstr, ok := str.(Stream); ok {
return bstr, err
}
return nil, fmt.Errorf("Stream %d is not a bidirectional stream", id)
}
// make sure to return an actual nil value here, not an Stream with value nil
return nil, err
}
// AcceptStream returns the next stream openend by the peer // AcceptStream returns the next stream openend by the peer
func (s *session) AcceptStream() (Stream, error) { func (s *session) AcceptStream() (Stream, error) {
return s.streamsMap.AcceptStream() return s.streamsMap.AcceptStream()

24
session_test.go
View File

@@ -1429,30 +1429,6 @@ var _ = Describe("Session", func() {
}, 0.5) }, 0.5)
Context("getting streams", func() { Context("getting streams", func() {
It("returns a new stream", func() {
mstr := NewMockStreamI(mockCtrl)
streamManager.EXPECT().GetOrOpenSendStream(protocol.StreamID(11)).Return(mstr, nil)
str, err := sess.GetOrOpenStream(11)
Expect(err).ToNot(HaveOccurred())
Expect(str).To(Equal(mstr))
})
It("returns a nil-value (not an interface with value nil) for closed streams", func() {
strI := Stream(nil)
streamManager.EXPECT().GetOrOpenSendStream(protocol.StreamID(1337)).Return(strI, nil)
str, err := sess.GetOrOpenStream(1337)
Expect(err).ToNot(HaveOccurred())
// make sure that the returned value is a plain nil, not an Stream with value nil
_, ok := str.(Stream)
Expect(ok).To(BeFalse())
})
It("errors when trying to get a unidirectional stream", func() {
streamManager.EXPECT().GetOrOpenSendStream(protocol.StreamID(100)).Return(&sendStream{}, nil)
_, err := sess.GetOrOpenStream(100)
Expect(err).To(MatchError("Stream 100 is not a bidirectional stream"))
})
It("opens streams", func() { It("opens streams", func() {
mstr := NewMockStreamI(mockCtrl) mstr := NewMockStreamI(mockCtrl)
streamManager.EXPECT().OpenStream().Return(mstr, nil) streamManager.EXPECT().OpenStream().Return(mstr, nil)