Fix: tezos bytes

Author: aopoltorzhicky

tools/tezgen/types.go

@@ -7,7 +7,6 @@ import (
 	"time"
 
 	jsoniter "github.com/json-iterator/go"
-	"github.com/pkg/errors"
 )
 
 var json = jsoniter.ConfigCompatibleWithStandardLibrary
@@ -20,24 +19,16 @@ type Bytes []byte
 
 // UnmarshalJSON -
 func (b *Bytes) UnmarshalJSON(data []byte) error {
-	if len(data) == 0 {
-		return nil
-	}
-	if len(data)%2 == 1 {
-		return errors.Errorf("invalid bytes value with length %d: %v", data, len(data))
-	}
-	if len(data) > 1 {
-		if data[0] == '"' && data[len(data)-1] == '"' {
-			data = data[1 : len(data)-1]
-		}
-	}
-	byt := make([]byte, hex.DecodedLen(len(data)))
-	if _, err := hex.Decode(byt, data); err != nil {
+	var x string
+	if err := json.Unmarshal(data, &x); err != nil {
 		return err
 	}
 
-	*b = make([]byte, 0)
-	*b = append(*b, byt...)
+	str, err := hex.DecodeString(x)
+	if err != nil {
+		return err
+	}
+	*b = Bytes(str)
 	return nil
 }
 

tools/tezgen/types_test.go

@@ -15,18 +15,14 @@ func TestBytes_UnmarshalJSON(t *testing.T) {
 	}{
 		{
 			name: "test 1",
-			data: []byte{0x31, 0x32, 0x33, 0x34},
-			want: []byte{0x12, 0x34},
-		}, {
-			name: "test 2",
 			data: []byte{'"', '"'},
 			want: []byte{},
 		}, {
-			name:    "test 3",
+			name:    "test 2",
 			data:    []byte{0x00},
 			wantErr: true,
 		}, {
-			name: "test 4",
+			name: "test 3",
 			data: []byte{'"', '1', '2', '"'},
 			want: []byte{0x12},
 		},