forked from quic-go/quic-go
remove stream.ReadByte
This commit is contained in:
@@ -129,13 +129,6 @@ func (s *stream) Read(p []byte) (int, error) {
|
|||||||
return bytesRead, nil
|
return bytesRead, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// ReadByte implements io.ByteReader
|
|
||||||
func (s *stream) ReadByte() (byte, error) {
|
|
||||||
p := make([]byte, 1)
|
|
||||||
_, err := io.ReadFull(s, p)
|
|
||||||
return p[0], err
|
|
||||||
}
|
|
||||||
|
|
||||||
func (s *stream) Write(p []byte) (int, error) {
|
func (s *stream) Write(p []byte) (int, error) {
|
||||||
s.mutex.Lock()
|
s.mutex.Lock()
|
||||||
defer s.mutex.Unlock()
|
defer s.mutex.Unlock()
|
||||||
|
|||||||
@@ -150,27 +150,6 @@ var _ = Describe("Stream", func() {
|
|||||||
Expect(b).To(Equal([]byte{0xBE, 0xEF}))
|
Expect(b).To(Equal([]byte{0xBE, 0xEF}))
|
||||||
})
|
})
|
||||||
|
|
||||||
It("reads single bytes", func() {
|
|
||||||
frame := frames.StreamFrame{
|
|
||||||
Offset: 0,
|
|
||||||
Data: []byte{0xDE, 0xAD, 0xBE, 0xEF},
|
|
||||||
}
|
|
||||||
err := str.AddStreamFrame(&frame)
|
|
||||||
Expect(err).ToNot(HaveOccurred())
|
|
||||||
b, err := str.ReadByte()
|
|
||||||
Expect(err).ToNot(HaveOccurred())
|
|
||||||
Expect(b).To(Equal(byte(0xDE)))
|
|
||||||
b, err = str.ReadByte()
|
|
||||||
Expect(err).ToNot(HaveOccurred())
|
|
||||||
Expect(b).To(Equal(byte(0xAD)))
|
|
||||||
b, err = str.ReadByte()
|
|
||||||
Expect(err).ToNot(HaveOccurred())
|
|
||||||
Expect(b).To(Equal(byte(0xBE)))
|
|
||||||
b, err = str.ReadByte()
|
|
||||||
Expect(err).ToNot(HaveOccurred())
|
|
||||||
Expect(b).To(Equal(byte(0xEF)))
|
|
||||||
})
|
|
||||||
|
|
||||||
It("reads all data available", func() {
|
It("reads all data available", func() {
|
||||||
frame1 := frames.StreamFrame{
|
frame1 := frames.StreamFrame{
|
||||||
Offset: 0,
|
Offset: 0,
|
||||||
|
|||||||
@@ -7,16 +7,9 @@ import (
|
|||||||
"github.com/lucas-clemente/quic-go/protocol"
|
"github.com/lucas-clemente/quic-go/protocol"
|
||||||
)
|
)
|
||||||
|
|
||||||
// ReadStream is the read part of a QUIC stream
|
|
||||||
type ReadStream interface {
|
|
||||||
io.Reader
|
|
||||||
io.ByteReader
|
|
||||||
}
|
|
||||||
|
|
||||||
// Stream is the interface for QUIC streams
|
// Stream is the interface for QUIC streams
|
||||||
type Stream interface {
|
type Stream interface {
|
||||||
io.Reader
|
io.Reader
|
||||||
io.ByteReader
|
|
||||||
io.Writer
|
io.Writer
|
||||||
io.Closer
|
io.Closer
|
||||||
StreamID() protocol.StreamID
|
StreamID() protocol.StreamID
|
||||||
|
|||||||
Reference in New Issue
Block a user