[#971] morph/event: Change notification parser's signature
Parsers should have original notification structure to be able to construct internal event structure that contains necessary for unique nonce calculation information. So notification parsers take raw notification structure instead of slice of stack items. Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
parent
3666ae7ad2
commit
c167ae26f9
35 changed files with 365 additions and 203 deletions
|
@ -3,6 +3,8 @@ package neofs
|
|||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/nspcc-dev/neo-go/pkg/core/state"
|
||||
"github.com/nspcc-dev/neo-go/pkg/rpc/response/result/subscriptions"
|
||||
"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
|
||||
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
|
||||
"github.com/stretchr/testify/require"
|
||||
|
@ -23,36 +25,36 @@ func TestParseBind(t *testing.T) {
|
|||
stackitem.NewMap(),
|
||||
}
|
||||
|
||||
_, err := ParseBind(prms)
|
||||
_, err := ParseBind(createNotifyEventFromItems(prms))
|
||||
require.EqualError(t, err, event.WrongNumberOfParameters(2, len(prms)).Error())
|
||||
})
|
||||
|
||||
t.Run("wrong first parameter", func(t *testing.T) {
|
||||
_, err := ParseBind([]stackitem.Item{
|
||||
_, err := ParseBind(createNotifyEventFromItems([]stackitem.Item{
|
||||
stackitem.NewMap(),
|
||||
})
|
||||
}))
|
||||
|
||||
require.Error(t, err)
|
||||
})
|
||||
|
||||
t.Run("wrong second parameter", func(t *testing.T) {
|
||||
_, err := ParseBind([]stackitem.Item{
|
||||
_, err := ParseBind(createNotifyEventFromItems([]stackitem.Item{
|
||||
stackitem.NewByteArray(user),
|
||||
stackitem.NewMap(),
|
||||
})
|
||||
}))
|
||||
|
||||
require.Error(t, err)
|
||||
})
|
||||
|
||||
t.Run("correct", func(t *testing.T) {
|
||||
ev, err := ParseBind([]stackitem.Item{
|
||||
ev, err := ParseBind(createNotifyEventFromItems([]stackitem.Item{
|
||||
stackitem.NewByteArray(user),
|
||||
stackitem.NewArray([]stackitem.Item{
|
||||
stackitem.NewByteArray(publicKeys[0]),
|
||||
stackitem.NewByteArray(publicKeys[1]),
|
||||
stackitem.NewByteArray(publicKeys[2]),
|
||||
}),
|
||||
})
|
||||
}))
|
||||
require.NoError(t, err)
|
||||
|
||||
e := ev.(Bind)
|
||||
|
@ -61,3 +63,11 @@ func TestParseBind(t *testing.T) {
|
|||
require.Equal(t, publicKeys, e.Keys())
|
||||
})
|
||||
}
|
||||
|
||||
func createNotifyEventFromItems(items []stackitem.Item) *subscriptions.NotificationEvent {
|
||||
return &subscriptions.NotificationEvent{
|
||||
NotificationEvent: state.NotificationEvent{
|
||||
Item: stackitem.NewArray(items),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue