remove the custom BytesReader in favor of io.ByteReader

io.Reader is not needed anymore there.

Author: MichaelMure

constant.go

@@ -3,6 +3,7 @@ package varsig
 import (
 	"encoding/binary"
 	"fmt"
+	"io"
 )
 
 // Prefix is the value for the varsig's varuint prefix byte.
@@ -49,7 +50,7 @@ const (
 
 // DecodeHashAlgorithm reads and validates the expected hash algorithm
 // (for varsig types include a variable hash algorithm.)
-func DecodeHashAlgorithm(r BytesReader) (Hash, error) {
+func DecodeHashAlgorithm(r io.ByteReader) (Hash, error) {
 	u, err := binary.ReadUvarint(r)
 	if err != nil {
 		return HashUnspecified, fmt.Errorf("%w: %w", ErrUnknownHash, err)
@@ -114,7 +115,7 @@ const (
 
 // DecodePayloadEncoding reads and validates the expected canonical payload
 // encoding of the data to be signed.
-func DecodePayloadEncoding(r BytesReader) (PayloadEncoding, error) {
+func DecodePayloadEncoding(r io.ByteReader) (PayloadEncoding, error) {
 	seg1, err := binary.ReadUvarint(r)
 	if err != nil {
 		return PayloadEncodingUnspecified, fmt.Errorf("%w: %w", ErrUnsupportedPayloadEncoding, err)

ecdsa.go

@@ -3,6 +3,7 @@ package varsig
 import (
 	"encoding/binary"
 	"fmt"
+	"io"
 )
 
 // AlgorithmECDSA is the value specifying an ECDSA signature.
@@ -21,7 +22,7 @@ const (
 	CurveP521      = ECDSACurve(0x1202)
 )
 
-func decodeECDSACurve(r BytesReader) (ECDSACurve, error) {
+func decodeECDSACurve(r io.ByteReader) (ECDSACurve, error) {
 	u, err := binary.ReadUvarint(r)
 	if err != nil {
 		return 0, err
@@ -81,7 +82,7 @@ func (v ECDSAVarsig) Encode() []byte {
 	return buf
 }
 
-func decodeECDSA(r BytesReader) (Varsig, error) {
+func decodeECDSA(r io.ByteReader) (Varsig, error) {
 	curve, err := decodeECDSACurve(r)
 	if err != nil {
 		return nil, err

eddsa.go

@@ -3,6 +3,7 @@ package varsig
 import (
 	"encoding/binary"
 	"fmt"
+	"io"
 )
 
 // AlgorithmEdDSA is the value specifying an EdDSA signature.
@@ -19,7 +20,7 @@ const (
 	CurveEd448   = EdDSACurve(0x1203)
 )
 
-func decodeEdDSACurve(r BytesReader) (EdDSACurve, error) {
+func decodeEdDSACurve(r io.ByteReader) (EdDSACurve, error) {
 	u, err := binary.ReadUvarint(r)
 	if err != nil {
 		return 0, err
@@ -79,7 +80,7 @@ func (v EdDSAVarsig) Encode() []byte {
 	return buf
 }
 
-func decodeEdDSA(r BytesReader) (Varsig, error) {
+func decodeEdDSA(r io.ByteReader) (Varsig, error) {
 	curve, err := decodeEdDSACurve(r)
 	if err != nil {
 		return nil, err

registry.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"encoding/binary"
 	"fmt"
+	"io"
 )
 
 // Version represents which version of the varsig specification was used
@@ -18,7 +19,7 @@ const (
 
 // DecodeFunc is a function that parses the varsig representing a specific
 // signing algorithm.
-type DecodeFunc func(BytesReader) (Varsig, error)
+type DecodeFunc func(io.ByteReader) (Varsig, error)
 
 // Registry contains a mapping between known signing algorithms and
 // functions that can parse varsigs for that signing algorithm.
@@ -53,7 +54,7 @@ func (rs Registry) Decode(data []byte) (Varsig, error) {
 
 // DecodeStream converts data read from the provided io.Reader into one
 // of the registered Varsig types.
-func (rs Registry) DecodeStream(r BytesReader) (Varsig, error) {
+func (rs Registry) DecodeStream(r io.ByteReader) (Varsig, error) {
 	pre, err := binary.ReadUvarint(r)
 	if err != nil {
 		return nil, fmt.Errorf("%w: %w", ErrBadPrefix, err)
@@ -80,7 +81,7 @@ func (rs Registry) DecodeStream(r BytesReader) (Varsig, error) {
 	return decodeFunc(r)
 }
 
-func (rs Registry) decodeVersAndAlgo(r BytesReader) (Version, Algorithm, error) {
+func (rs Registry) decodeVersAndAlgo(r io.ByteReader) (Version, Algorithm, error) {
 	vers, err := binary.ReadUvarint(r)
 	if err != nil {
 		return Version(vers), 0, err

registry_test.go

@@ -3,6 +3,7 @@ package varsig_test
 import (
 	"bytes"
 	"encoding/hex"
+	"io"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -41,7 +42,7 @@ func testRegistry(t *testing.T) varsig.Registry {
 }
 
 func testDecodeFunc(algo varsig.Algorithm) varsig.DecodeFunc {
-	return func(r varsig.BytesReader) (varsig.Varsig, error) {
+	return func(r io.ByteReader) (varsig.Varsig, error) {
 		return &testVarsig{algo: algo}, nil
 	}
 }

rsa.go

@@ -2,6 +2,7 @@ package varsig
 
 import (
 	"encoding/binary"
+	"io"
 )
 
 // AlgorithmRSA is the value specifying an RSA signature.
@@ -53,7 +54,7 @@ func (v RSAVarsig) KeyLength() uint64 {
 	return v.keyLen
 }
 
-func decodeRSA(r BytesReader) (Varsig, error) {
+func decodeRSA(r io.ByteReader) (Varsig, error) {
 	hashAlg, err := DecodeHashAlgorithm(r)
 	if err != nil {
 		return nil, err

varsig.go

@@ -50,7 +50,7 @@ func Decode(data []byte) (Varsig, error) {
 
 // DecodeStream converts data read from the provided io.Reader into one
 // of the Varsig types provided by the DefaultRegistry.
-func DecodeStream(r BytesReader) (Varsig, error) {
+func DecodeStream(r io.ByteReader) (Varsig, error) {
 	return DefaultRegistry().DecodeStream(r)
 }
 
@@ -88,8 +88,3 @@ func (v varsig) encode() []byte {
 
 	return buf
 }
-
-type BytesReader interface {
-	io.ByteReader
-	io.Reader
-}