george.bartolomey/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#1541] morph/event: Simplify netmap contract event parsing

Browse source 
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
Evgenii Stratonikov 2024-12-05 11:58:38 +03:00 committed by Evgenii Stratonikov
parent a353d45742
commit 1c12f23b84
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
pkg/morph/event/netmap/epoch.go
View file

@ -1,9 +1,7 @@
package netmap package netmap
import ( import (
"fmt" "git.frostfs.info/TrueCloudLab/frostfs-contract/rpcclient/netmap"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event" "git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event"
"github.com/nspcc-dev/neo-go/pkg/core/state" "github.com/nspcc-dev/neo-go/pkg/core/state"
"github.com/nspcc-dev/neo-go/pkg/util" "github.com/nspcc-dev/neo-go/pkg/util"
@ -37,22 +35,13 @@ func (s NewEpoch) TxHash() util.Uint256 {
// //
// Result is type of NewEpoch. // Result is type of NewEpoch.
func ParseNewEpoch(e *state.ContainedNotificationEvent) (event.Event, error) { func ParseNewEpoch(e *state.ContainedNotificationEvent) (event.Event, error) {
params, err := event.ParseStackArray(e) var nee netmap.NewEpochEvent
if err != nil { if err := nee.FromStackItem(e.Item); err != nil {
return nil, fmt.Errorf("could not parse stack items from notify event: %w", err) return nil, err
}
if ln := len(params); ln != 1 {
return nil, event.WrongNumberOfParameters(1, ln)
}
prmEpochNum, err := client.IntFromStackItem(params[0])
if err != nil {
return nil, fmt.Errorf("could not get integer epoch number: %w", err)
} }
return NewEpoch{ return NewEpoch{
Num: uint64(prmEpochNum), Num: uint64(nee.Epoch.Uint64()),
Hash: e.Container, Hash: e.Container,
}, nil }, nil
} }

3
pkg/morph/event/netmap/epoch_test.go
View file

@ -4,7 +4,6 @@ import (
"math/big" "math/big"
"testing" "testing"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event"
"github.com/nspcc-dev/neo-go/pkg/vm/stackitem" "github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
@ -17,7 +16,7 @@ func TestParseNewEpoch(t *testing.T) {
} }
_, err := ParseNewEpoch(createNotifyEventFromItems(prms)) _, err := ParseNewEpoch(createNotifyEventFromItems(prms))
require.EqualError(t, err, event.WrongNumberOfParameters(1, len(prms)).Error()) require.Error(t, err)
}) })
t.Run("wrong first parameter type", func(t *testing.T) { t.Run("wrong first parameter type", func(t *testing.T) {