From e2f4e4e83c42b76d7258d8d1030c551b57656f26 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Tue, 30 Mar 2021 15:53:29 +0700
Subject: [PATCH 1/2] remove unused bytesSplit function

---
 codec.go | 26 --------------------------
 1 file changed, 26 deletions(-)

diff --git a/codec.go b/codec.go
index e6b7447..c0da1f9 100644
--- a/codec.go
+++ b/codec.go
@@ -176,29 +176,3 @@ func sizeForAddr(p Protocol, b []byte) (skip, size int, err error) {
 		return n, size, nil
 	}
 }
-
-func bytesSplit(b []byte) ([][]byte, error) {
-	var ret [][]byte
-	for len(b) > 0 {
-		code, n, err := ReadVarintCode(b)
-		if err != nil {
-			return nil, err
-		}
-
-		p := ProtocolWithCode(code)
-		if p.Code == 0 {
-			return nil, fmt.Errorf("no protocol with code %d", b[0])
-		}
-
-		n2, size, err := sizeForAddr(p, b[n:])
-		if err != nil {
-			return nil, err
-		}
-
-		length := n + n2 + size
-		ret = append(ret, b[:length])
-		b = b[length:]
-	}
-
-	return ret, nil
-}

From 927b81c5e9d5ee2037931a5017bf981284b44e79 Mon Sep 17 00:00:00 2001
From: Marten Seemann <martenseemann@gmail.com>
Date: Tue, 30 Mar 2021 15:54:55 +0700
Subject: [PATCH 2/2] fix error strings

---
 transcoders.go | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/transcoders.go b/transcoders.go
index f4a59c3..8f813cd 100644
--- a/transcoders.go
+++ b/transcoders.go
@@ -137,12 +137,12 @@ var TranscoderOnion = NewTranscoderFromFunctions(onionStB, onionBtS, nil)
 func onionStB(s string) ([]byte, error) {
 	addr := strings.Split(s, ":")
 	if len(addr) != 2 {
-		return nil, fmt.Errorf("failed to parse onion addr: %s does not contain a port number.", s)
+		return nil, fmt.Errorf("failed to parse onion addr: %s does not contain a port number", s)
 	}
 
 	// onion address without the ".onion" substring
 	if len(addr[0]) != 16 {
-		return nil, fmt.Errorf("failed to parse onion addr: %s not a Tor onion address.", s)
+		return nil, fmt.Errorf("failed to parse onion addr: %s not a Tor onion address", s)
 	}
 	onionHostBytes, err := base32.StdEncoding.DecodeString(strings.ToUpper(addr[0]))
 	if err != nil {
@@ -180,7 +180,7 @@ var TranscoderOnion3 = NewTranscoderFromFunctions(onion3StB, onion3BtS, nil)
 func onion3StB(s string) ([]byte, error) {
 	addr := strings.Split(s, ":")
 	if len(addr) != 2 {
-		return nil, fmt.Errorf("failed to parse onion addr: %s does not contain a port number.", s)
+		return nil, fmt.Errorf("failed to parse onion addr: %s does not contain a port number", s)
 	}
 
 	// onion address without the ".onion" substring
@@ -228,7 +228,7 @@ func garlic64StB(s string) ([]byte, error) {
 	// i2p base64 address will be between 516 and 616 characters long, depending on
 	// certificate type
 	if len(s) < 516 || len(s) > 616 {
-		return nil, fmt.Errorf("failed to parse garlic addr: %s not an i2p base64 address. len: %d\n", s, len(s))
+		return nil, fmt.Errorf("failed to parse garlic addr: %s not an i2p base64 address. len: %d", s, len(s))
 	}
 	garlicHostBytes, err := garlicBase64Encoding.DecodeString(s)
 	if err != nil {
@@ -249,7 +249,7 @@ func garlic64BtS(b []byte) (string, error) {
 func garlic64Validate(b []byte) error {
 	// A garlic64 address will always be greater than 386 bytes long when encoded.
 	if len(b) < 386 {
-		return fmt.Errorf("failed to validate garlic addr: %s not an i2p base64 address. len: %d\n", b, len(b))
+		return fmt.Errorf("failed to validate garlic addr: %s not an i2p base64 address. len: %d", b, len(b))
 	}
 	return nil
 }
@@ -286,7 +286,7 @@ func garlic32Validate(b []byte) error {
 	// an i2p base64 for an Encrypted Leaseset v2 will be at least 35 bytes
 	// long other than that, they will be exactly 32 bytes
 	if len(b) < 35 && len(b) != 32 {
-		return fmt.Errorf("failed to validate garlic addr: %s not an i2p base32 address. len: %d\n", b, len(b))
+		return fmt.Errorf("failed to validate garlic addr: %s not an i2p base32 address. len: %d", b, len(b))
 	}
 	return nil
 }