From 7c1776a281c9f243cb2d03f41574b64fe87f8ed5 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Thu, 5 Nov 2020 16:26:28 +0300 Subject: [PATCH] [#152] Add ID field to update state event 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 --- pkg/morph/event/neofs/config.go | 17 +++++++++++++---- pkg/morph/event/neofs/config_test.go | 15 ++++++++++++++- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/pkg/morph/event/neofs/config.go b/pkg/morph/event/neofs/config.go index e84d8acb..af029733 100644 --- a/pkg/morph/event/neofs/config.go +++ b/pkg/morph/event/neofs/config.go @@ -10,11 +10,14 @@ import ( type Config struct { key []byte value []byte + id []byte } // MorphEvent implements Neo:Morph Event interface. func (Config) MorphEvent() {} +func (u Config) ID() []byte { return u.id } + func (u Config) Key() []byte { return u.key } func (u Config) Value() []byte { return u.value } @@ -25,18 +28,24 @@ func ParseConfig(params []stackitem.Item) (event.Event, error) { err error ) - if ln := len(params); ln != 2 { - return nil, event.WrongNumberOfParameters(2, ln) + if ln := len(params); ln != 3 { + 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 - ev.key, err = client.BytesFromStackItem(params[0]) + ev.key, err = client.BytesFromStackItem(params[1]) if err != nil { return nil, errors.Wrap(err, "could not get config key") } // parse value - ev.value, err = client.BytesFromStackItem(params[1]) + ev.value, err = client.BytesFromStackItem(params[2]) if err != nil { return nil, errors.Wrap(err, "could not get config value") } diff --git a/pkg/morph/event/neofs/config_test.go b/pkg/morph/event/neofs/config_test.go index c41f452b..fbe060fa 100644 --- a/pkg/morph/event/neofs/config_test.go +++ b/pkg/morph/event/neofs/config_test.go @@ -10,6 +10,7 @@ import ( func TestParseConfig(t *testing.T) { var ( + id = []byte("id") key = []byte("key") value = []byte("value") ) @@ -20,7 +21,7 @@ func TestParseConfig(t *testing.T) { } _, 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) { @@ -33,6 +34,16 @@ func TestParseConfig(t *testing.T) { t.Run("wrong second parameter", func(t *testing.T) { _, 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.NewMap(), }) @@ -42,12 +53,14 @@ func TestParseConfig(t *testing.T) { t.Run("correct", func(t *testing.T) { ev, err := ParseConfig([]stackitem.Item{ + stackitem.NewByteArray(id), stackitem.NewByteArray(key), stackitem.NewByteArray(value), }) require.NoError(t, err) require.Equal(t, Config{ + id: id, key: key, value: value, }, ev)