achuprov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#152] Add ID field to update state event

Browse source 
NeoFS contract produces event with three arguments:
  - update ID,
  - config key,
  - config value.

Update ID is a unique shared by inner ring holders
byte sequence that is used to update NeoFS runtime
configuration.

Signed-off-by: Alex Vanin <alexey@nspcc.ru>
This commit is contained in:
Alex Vanin 2020-11-05 16:26:28 +03:00 committed by Alex Vanin
parent 49da96d006
commit 7c1776a281
2 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
pkg/morph/event/neofs/config.go
View file

@ -10,11 +10,14 @@ import (
type Config struct { type Config struct {
key []byte key []byte
value []byte value []byte
id []byte
} }
// MorphEvent implements Neo:Morph Event interface. // MorphEvent implements Neo:Morph Event interface.
func (Config) MorphEvent() {} func (Config) MorphEvent() {}
func (u Config) ID() []byte { return u.id }
func (u Config) Key() []byte { return u.key } func (u Config) Key() []byte { return u.key }
func (u Config) Value() []byte { return u.value } func (u Config) Value() []byte { return u.value }
@ -25,18 +28,24 @@ func ParseConfig(params []stackitem.Item) (event.Event, error) {
err error err error
) )
if ln := len(params); ln != 2 { if ln := len(params); ln != 3 {
return nil, event.WrongNumberOfParameters(2, ln) return nil, event.WrongNumberOfParameters(3, ln)
}
// parse id
ev.id, err = client.BytesFromStackItem(params[0])
if err != nil {
return nil, errors.Wrap(err, "could not get config update id")
} }
// parse key // parse key
ev.key, err = client.BytesFromStackItem(params[0]) ev.key, err = client.BytesFromStackItem(params[1])
if err != nil { if err != nil {
return nil, errors.Wrap(err, "could not get config key") return nil, errors.Wrap(err, "could not get config key")
} }
// parse value // parse value
ev.value, err = client.BytesFromStackItem(params[1]) ev.value, err = client.BytesFromStackItem(params[2])
if err != nil { if err != nil {
return nil, errors.Wrap(err, "could not get config value") return nil, errors.Wrap(err, "could not get config value")
} }

15
pkg/morph/event/neofs/config_test.go
View file

@ -10,6 +10,7 @@ import (
func TestParseConfig(t *testing.T) { func TestParseConfig(t *testing.T) {
var ( var (
id = []byte("id")
key = []byte("key") key = []byte("key")
value = []byte("value") value = []byte("value")
) )
@ -20,7 +21,7 @@ func TestParseConfig(t *testing.T) {
} }
_, err := ParseConfig(prms) _, err := ParseConfig(prms)
require.EqualError(t, err, event.WrongNumberOfParameters(2, len(prms)).Error()) require.EqualError(t, err, event.WrongNumberOfParameters(3, len(prms)).Error())
}) })
t.Run("wrong first parameter", func(t *testing.T) { t.Run("wrong first parameter", func(t *testing.T) {
@ -33,6 +34,16 @@ func TestParseConfig(t *testing.T) {
t.Run("wrong second parameter", func(t *testing.T) { t.Run("wrong second parameter", func(t *testing.T) {
_, err := ParseConfig([]stackitem.Item{ _, err := ParseConfig([]stackitem.Item{
stackitem.NewByteArray(id),
stackitem.NewMap(),
})
require.Error(t, err)
})
t.Run("wrong third parameter", func(t *testing.T) {
_, err := ParseConfig([]stackitem.Item{
stackitem.NewByteArray(id),
stackitem.NewByteArray(key), stackitem.NewByteArray(key),
stackitem.NewMap(), stackitem.NewMap(),
}) })
@ -42,12 +53,14 @@ func TestParseConfig(t *testing.T) {
t.Run("correct", func(t *testing.T) { t.Run("correct", func(t *testing.T) {
ev, err := ParseConfig([]stackitem.Item{ ev, err := ParseConfig([]stackitem.Item{
stackitem.NewByteArray(id),
stackitem.NewByteArray(key), stackitem.NewByteArray(key),
stackitem.NewByteArray(value), stackitem.NewByteArray(value),
}) })
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, Config{ require.Equal(t, Config{
id: id,
key: key, key: key,
value: value, value: value,
}, ev) }, ev)