From b2177c92d8aa657ca200da05f7b80592976ee357 Mon Sep 17 00:00:00 2001 From: Lucas Clemente Date: Fri, 24 Feb 2017 18:40:12 +0100 Subject: [PATCH] remove stream.CloseRemote from public API --- h2quic/server.go | 8 ++++++-- interface.go | 1 - session_test.go | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/h2quic/server.go b/h2quic/server.go index 2fdebfc2..09f4dacd 100644 --- a/h2quic/server.go +++ b/h2quic/server.go @@ -11,7 +11,7 @@ import ( "sync/atomic" "time" - "github.com/lucas-clemente/quic-go" + quic "github.com/lucas-clemente/quic-go" "github.com/lucas-clemente/quic-go/protocol" "github.com/lucas-clemente/quic-go/qerr" "github.com/lucas-clemente/quic-go/utils" @@ -24,6 +24,10 @@ type streamCreator interface { GetOrOpenStream(protocol.StreamID) (quic.Stream, error) } +type remoteCloser interface { + CloseRemote(protocol.ByteCount) +} + // Server is a HTTP2 server listening for QUIC connections. type Server struct { *http.Server @@ -173,7 +177,7 @@ func (s *Server) handleRequest(session streamCreator, headerStream quic.Stream, var streamEnded bool if h2headersFrame.StreamEnded() { - dataStream.CloseRemote(0) + dataStream.(remoteCloser).CloseRemote(0) streamEnded = true _, _ = dataStream.Read([]byte{0}) // read the eof } diff --git a/interface.go b/interface.go index 24a0b5d4..4f7fe5d4 100644 --- a/interface.go +++ b/interface.go @@ -14,7 +14,6 @@ type Stream interface { io.Writer io.Closer StreamID() protocol.StreamID - CloseRemote(offset protocol.ByteCount) Reset(error) } diff --git a/session_test.go b/session_test.go index 0fc82349..3bff2b52 100644 --- a/session_test.go +++ b/session_test.go @@ -1274,7 +1274,7 @@ var _ = Describe("Session", func() { err = s.Close() Expect(err).NotTo(HaveOccurred()) s.(*stream).sentFin() - s.CloseRemote(0) + s.(*stream).CloseRemote(0) _, err = s.Read([]byte("a")) Expect(err).To(MatchError(io.EOF)) sess.garbageCollectStreams()