TrueCloudLab/neoneo-go
7
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity

stackitem: introduce Convertible interface

Browse source 
We have a lot of native contract types that are converted to stack items
before serialization, then deserialized as stack items and converted back to
regular structures. stackitem.Convertible allows to remove a lot of repetitive
io.Serializable code.

This also introduces to/from converter in testserdes which unfortunately
required to change util tests to avoid circular references.
This commit is contained in:
Roman Khimov 2021-07-17 18:37:33 +03:00
parent 2d993d0da5
commit aab18c3083
23 changed files with 223 additions and 339 deletions
Download patch file Download diff file Expand all files Collapse all files

33
pkg/util/uint256_test.go
View file

@ -1,21 +1,22 @@
package util
package util_test
import (
"encoding/hex"
"testing"
"github.com/nspcc-dev/neo-go/internal/testserdes"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)
func TestUint256UnmarshalJSON(t *testing.T) {
str := "f037308fa0ab18155bccfc08485468c112409ea5064595699e98c545f245f32d"
expected, err := Uint256DecodeStringLE(str)
expected, err := util.Uint256DecodeStringLE(str)
require.NoError(t, err)
// UnmarshalJSON decodes hex-strings
var u1, u2 Uint256
var u1, u2 util.Uint256
require.NoError(t, u1.UnmarshalJSON([]byte(`"`+str+`"`)))
assert.True(t, expected.Equals(u1))
@ -28,33 +29,33 @@ func TestUint256UnmarshalJSON(t *testing.T) {
func TestUint256DecodeString(t *testing.T) {
hexStr := "f037308fa0ab18155bccfc08485468c112409ea5064595699e98c545f245f32d"
val, err := Uint256DecodeStringLE(hexStr)
val, err := util.Uint256DecodeStringLE(hexStr)
require.NoError(t, err)
assert.Equal(t, hexStr, val.StringLE())
valBE, err := Uint256DecodeStringBE(hexStr)
valBE, err := util.Uint256DecodeStringBE(hexStr)
require.NoError(t, err)
assert.Equal(t, val, valBE.Reverse())
bs, err := hex.DecodeString(hexStr)
require.NoError(t, err)
val1, err := Uint256DecodeBytesBE(bs)
val1, err := util.Uint256DecodeBytesBE(bs)
assert.NoError(t, err)
assert.Equal(t, hexStr, val1.String())
assert.Equal(t, val, val1.Reverse())
_, err = Uint256DecodeStringLE(hexStr[1:])
_, err = util.Uint256DecodeStringLE(hexStr[1:])
assert.Error(t, err)
_, err = Uint256DecodeStringBE(hexStr[1:])
_, err = util.Uint256DecodeStringBE(hexStr[1:])
assert.Error(t, err)
hexStr = "zzz7308fa0ab18155bccfc08485468c112409ea5064595699e98c545f245f32d"
_, err = Uint256DecodeStringLE(hexStr)
_, err = util.Uint256DecodeStringLE(hexStr)
assert.Error(t, err)
_, err = Uint256DecodeStringBE(hexStr)
_, err = util.Uint256DecodeStringBE(hexStr)
assert.Error(t, err)
}
@ -63,11 +64,11 @@ func TestUint256DecodeBytes(t *testing.T) {
b, err := hex.DecodeString(hexStr)
require.NoError(t, err)
val, err := Uint256DecodeBytesLE(b)
val, err := util.Uint256DecodeBytesLE(b)
require.NoError(t, err)
assert.Equal(t, hexStr, val.StringLE())
_, err = Uint256DecodeBytesBE(b[1:])
_, err = util.Uint256DecodeBytesBE(b[1:])
assert.Error(t, err)
}
@ -75,10 +76,10 @@ func TestUInt256Equals(t *testing.T) {
a := "f037308fa0ab18155bccfc08485468c112409ea5064595699e98c545f245f32d"
b := "e287c5b29a1b66092be6803c59c765308ac20287e1b4977fd399da5fc8f66ab5"
ua, err := Uint256DecodeStringLE(a)
ua, err := util.Uint256DecodeStringLE(a)
require.NoError(t, err)
ub, err := Uint256DecodeStringLE(b)
ub, err := util.Uint256DecodeStringLE(b)
require.NoError(t, err)
assert.False(t, ua.Equals(ub), "%s and %s cannot be equal", ua, ub)
assert.True(t, ua.Equals(ua), "%s and %s must be equal", ua, ua)
@ -86,11 +87,11 @@ func TestUInt256Equals(t *testing.T) {
}
func TestUint256_Serializable(t *testing.T) {
a := Uint256{
a := util.Uint256{
1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16,
17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32,
}
var b Uint256
var b util.Uint256
testserdes.EncodeDecodeBinary(t, &a, &b)
}