stackitem: make ByteArray an alias to []byte

Signed-off-by: Evgeniy Stratonikov <evgeniy@nspcc.ru>

pkg/vm/stackitem/item.go

@@ -101,13 +101,9 @@ func Make(v interface{}) Item {
 	case uint64:
 		return (*BigInteger)(new(big.Int).SetUint64(val))
 	case []byte:
-		return &ByteArray{
+		return NewByteArray(val)
-			value: val,
-		}
 	case string:
-		return &ByteArray{
+		return NewByteArray([]byte(val))
-			value: []byte(val),
-		}
 	case bool:
 		return Bool(val)
 	case []Item:
@@ -538,25 +534,21 @@ func (i Bool) Convert(typ Type) (Item, error) {
 }
 
 // ByteArray represents a byte array on the stack.
-type ByteArray struct {
+type ByteArray []byte
-	value []byte
-}
 
 // NewByteArray returns an new ByteArray object.
 func NewByteArray(b []byte) *ByteArray {
-	return &ByteArray{
+	return (*ByteArray)(&b)
-		value: b,
-	}
 }
 
 // Value implements Item interface.
 func (i *ByteArray) Value() interface{} {
-	return i.value
+	return []byte(*i)
 }
 
 // MarshalJSON implements the json.Marshaler interface.
 func (i *ByteArray) MarshalJSON() ([]byte, error) {
-	return json.Marshal(hex.EncodeToString(i.value))
+	return json.Marshal(hex.EncodeToString(*i))
 }
 
 func (i *ByteArray) String() string {
@@ -565,10 +557,10 @@ func (i *ByteArray) String() string {
 
 // TryBool implements Item interface.
 func (i *ByteArray) TryBool() (bool, error) {
-	if len(i.value) > MaxBigIntegerSizeBits/8 {
+	if len(*i) > MaxBigIntegerSizeBits/8 {
 		return false, errTooBigInteger
 	}
-	for _, b := range i.value {
+	for _, b := range *i {
 		if b != 0 {
 			return true, nil
 		}
@@ -577,21 +569,21 @@ func (i *ByteArray) TryBool() (bool, error) {
 }
 
 // TryBytes implements Item interface.
-func (i *ByteArray) TryBytes() ([]byte, error) {
+func (i ByteArray) TryBytes() ([]byte, error) {
-	return i.value, nil
+	return i, nil
 }
 
 // TryInteger implements Item interface.
-func (i *ByteArray) TryInteger() (*big.Int, error) {
+func (i ByteArray) TryInteger() (*big.Int, error) {
-	if len(i.value) > MaxBigIntegerSizeBits/8 {
+	if len(i) > MaxBigIntegerSizeBits/8 {
 		return nil, errTooBigInteger
 	}
-	return bigint.FromBytes(i.value), nil
+	return bigint.FromBytes(i), nil
 }
 
 // Equals implements Item interface.
 func (i *ByteArray) Equals(s Item) bool {
-	if len(i.value) > MaxByteArrayComparableSize {
+	if len(*i) > MaxByteArrayComparableSize {
 		panic(errTooBigComparable)
 	}
 	if i == s {
@@ -603,15 +595,16 @@ func (i *ByteArray) Equals(s Item) bool {
 	if !ok {
 		return false
 	}
-	if len(val.value) > MaxByteArrayComparableSize {
+	if len(*val) > MaxByteArrayComparableSize {
 		panic(errTooBigComparable)
 	}
-	return bytes.Equal(i.value, val.value)
+	return bytes.Equal(*i, *val)
 }
 
 // Dup implements Item interface.
 func (i *ByteArray) Dup() Item {
-	return &ByteArray{slice.Copy(i.value)}
+	ba := slice.Copy(*i)
+	return (*ByteArray)(&ba)
 }
 
 // Type implements Item interface.
@@ -1146,7 +1139,7 @@ func deepCopy(item Item, seen map[Item]Item) Item {
 		bi := new(big.Int).Set(it.Big())
 		return (*BigInteger)(bi)
 	case *ByteArray:
-		return NewByteArray(slice.Copy(it.value))
+		return NewByteArray(slice.Copy(*it))
 	case *Buffer:
 		return NewBuffer(slice.Copy(it.value))
 	case Bool:

pkg/vm/stackitem/item_test.go

@@ -47,19 +47,19 @@ var makeStackItemTestCases = []struct {
 	},
 	{
 		input:  []byte{1, 2, 3, 4},
-		result: &ByteArray{value: []byte{1, 2, 3, 4}},
+		result: NewByteArray([]byte{1, 2, 3, 4}),
 	},
 	{
 		input:  []byte{},
-		result: &ByteArray{value: []byte{}},
+		result: NewByteArray([]byte{}),
 	},
 	{
 		input:  "bla",
-		result: &ByteArray{value: []byte("bla")},
+		result: NewByteArray([]byte("bla")),
 	},
 	{
 		input:  "",
-		result: &ByteArray{value: []byte{}},
+		result: NewByteArray([]byte{}),
 	},
 	{
 		input:  true,
@@ -70,8 +70,8 @@ var makeStackItemTestCases = []struct {
 		result: Bool(false),
 	},
 	{
-		input:  []Item{(*BigInteger)(big.NewInt(3)), &ByteArray{value: []byte{1, 2, 3}}},
+		input:  []Item{(*BigInteger)(big.NewInt(3)), NewByteArray([]byte{1, 2, 3})},
-		result: &Array{value: []Item{(*BigInteger)(big.NewInt(3)), &ByteArray{value: []byte{1, 2, 3}}}},
+		result: &Array{value: []Item{(*BigInteger)(big.NewInt(3)), NewByteArray([]byte{1, 2, 3})}},
 	},
 	{
 		input:  []int{1, 2, 3},
@@ -441,7 +441,7 @@ var marshalJSONTestCases = []struct {
 		result: []byte(`"010203"`),
 	},
 	{
-		input:  &Array{value: []Item{(*BigInteger)(big.NewInt(3)), &ByteArray{value: []byte{1, 2, 3}}}},
+		input:  &Array{value: []Item{(*BigInteger)(big.NewInt(3)), NewByteArray([]byte{1, 2, 3})}},
 		result: []byte(`[3,"010203"]`),
 	},
 	{