TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#124] Update neo-go to pre-preview4 version

Browse source 
Neo-go does not use smartcontract.Parameter to return values
anymore, so it's convertes partly removed from neofs-node.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-10-26 17:46:15 +03:00 • committed by Alex Vanin
parent 2bd827a478
commit 174efc9df3
35 changed files with 309 additions and 841 deletions
Download patch file Download diff file Expand all files Collapse all files

56
pkg/morph/event/neofs/bind_test.go
View file

@ -6,8 +6,8 @@ import (
"testing"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/smartcontract"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
crypto "github.com/nspcc-dev/neofs-crypto"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
"github.com/nspcc-dev/neofs-node/pkg/util/test"
@ -25,8 +25,8 @@ func TestParseBind(t *testing.T) {
)
t.Run("wrong number of parameters", func(t *testing.T) {
prms := []smartcontract.Parameter{
{},
prms := []stackitem.Item{
stackitem.NewMap(),
}
_, err := ParseBind(prms)
@ -34,58 +34,38 @@ func TestParseBind(t *testing.T) {
})
t.Run("wrong first parameter", func(t *testing.T) {
_, err := ParseBind([]smartcontract.Parameter{
{
Type: smartcontract.ArrayType,
},
_, err := ParseBind([]stackitem.Item{
stackitem.NewMap(),
})
require.Error(t, err)
})
t.Run("wrong second parameter", func(t *testing.T) {
_, err := ParseBind([]smartcontract.Parameter{
{
Type: smartcontract.ByteArrayType,
Value: user.BytesBE(),
},
{
Type: smartcontract.ArrayType,
},
_, err := ParseBind([]stackitem.Item{
stackitem.NewByteArray(user.BytesBE()),
stackitem.NewMap(),
})
require.Error(t, err)
})
t.Run("correct", func(t *testing.T) {
ev, err := ParseBind([]smartcontract.Parameter{
{
Type: smartcontract.ByteArrayType,
Value: user.BytesBE(),
},
{
Type: smartcontract.ArrayType,
Value: []smartcontract.Parameter{
{
Type: smartcontract.ByteArrayType,
Value: crypto.MarshalPublicKey(publicKeys[0]),
},
{
Type: smartcontract.ByteArrayType,
Value: crypto.MarshalPublicKey(publicKeys[1]),
},
{
Type: smartcontract.ByteArrayType,
Value: crypto.MarshalPublicKey(publicKeys[2]),
},
},
},
ev, err := ParseBind([]stackitem.Item{
stackitem.NewByteArray(user.BytesBE()),
stackitem.NewArray([]stackitem.Item{
stackitem.NewByteArray(crypto.MarshalPublicKey(publicKeys[0])),
stackitem.NewByteArray(crypto.MarshalPublicKey(publicKeys[1])),
stackitem.NewByteArray(crypto.MarshalPublicKey(publicKeys[2])),
}),
})
require.NoError(t, err)
expKeys := make([]*keys.PublicKey, len(publicKeys))
for i := range publicKeys {
expKeys[i], err = keys.NewPublicKeyFromBytes(crypto.MarshalPublicKey(publicKeys[i]), elliptic.P256())
expKeys[i], err = keys.NewPublicKeyFromBytes(
crypto.MarshalPublicKey(publicKeys[i]), elliptic.P256())
require.NoError(t, err)
}