chore: mini refactor

nange · Nov 19, 2024 · 909224b · 909224b
1 parent 9ce91cd
commit 909224b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/cipherstream/cipherstream.go b/cipherstream/cipherstream.go
@@ -182,8 +182,7 @@ func (cs *CipherStream) Read(b []byte) (int, error) {
 		return cn, nil
 	}
 
-	var frame *Frame
-	for frame = range cs.frameIter.Iter() {
+	for frame := range cs.frameIter.Iter() {
 		if cs.frameIter.Error() != nil {
 			if timeout(cs.frameIter.Error()) {
 				return 0, errors.Join(cs.frameIter.Error(), ErrTimeout)
@@ -204,19 +203,16 @@ func (cs *CipherStream) Read(b []byte) (int, error) {
 			continue
 		}
 
-		break
-	}
+		rawData := frame.RawDataPayload()
+		cn := copy(b, rawData)
+		if cn < len(rawData) {
+			cs.leftover = rawData[cn:]
+		}
 
-	if frame == nil {
-		panic("frame must not be nil")
-	}
-	rawData := frame.RawDataPayload()
-	cn := copy(b, rawData)
-	if cn < len(rawData) {
-		cs.leftover = rawData[cn:]
+		return cn, nil
 	}
 
-	return cn, nil
+	return 0, io.ErrUnexpectedEOF
 }
 
 func (cs *CipherStream) ReadFrame() (*Frame, error) {

diff --git a/cipherstream/errors.go b/cipherstream/errors.go
@@ -9,5 +9,4 @@ var (
 	ErrACKRSTStream = errors.New("receive ACK_RST_STREAM frame")
 	ErrTimeout      = errors.New("net: io timeout error")
 	ErrPayloadSize  = errors.New("payload size is invalid")
-	ErrPingHook     = errors.New("ping hook error")
 )