From 1c12f23b841511b95efac32b62470a7b1e316fb3 Mon Sep 17 00:00:00 2001
From: Evgenii Stratonikov <e.stratonikov@yadro.com>
Date: Thu, 5 Dec 2024 11:58:38 +0300
Subject: [PATCH] [#1541] morph/event: Simplify netmap contract event parsing

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
 pkg/morph/event/netmap/epoch.go      | 21 +++++----------------
 pkg/morph/event/netmap/epoch_test.go |  3 +--
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkg/morph/event/netmap/epoch.go b/pkg/morph/event/netmap/epoch.go
index e454e2a6a..4dcc0d035 100644
--- a/pkg/morph/event/netmap/epoch.go
+++ b/pkg/morph/event/netmap/epoch.go
@@ -1,9 +1,7 @@
 package netmap
 
 import (
-	"fmt"
-
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
+	"git.frostfs.info/TrueCloudLab/frostfs-contract/rpcclient/netmap"
 	"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/util"
@@ -37,22 +35,13 @@ func (s NewEpoch) TxHash() util.Uint256 {
 //
 // Result is type of NewEpoch.
 func ParseNewEpoch(e *state.ContainedNotificationEvent) (event.Event, error) {
-	params, err := event.ParseStackArray(e)
-	if err != nil {
-		return nil, fmt.Errorf("could not parse stack items from notify event: %w", 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)
+	var nee netmap.NewEpochEvent
+	if err := nee.FromStackItem(e.Item); err != nil {
+		return nil, err
 	}
 
 	return NewEpoch{
-		Num:  uint64(prmEpochNum),
+		Num:  uint64(nee.Epoch.Uint64()),
 		Hash: e.Container,
 	}, nil
 }
diff --git a/pkg/morph/event/netmap/epoch_test.go b/pkg/morph/event/netmap/epoch_test.go
index bc267ecb6..6ff692327 100644
--- a/pkg/morph/event/netmap/epoch_test.go
+++ b/pkg/morph/event/netmap/epoch_test.go
@@ -4,7 +4,6 @@ import (
 	"math/big"
 	"testing"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/event"
 	"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
 	"github.com/stretchr/testify/require"
 )
@@ -17,7 +16,7 @@ func TestParseNewEpoch(t *testing.T) {
 		}
 
 		_, 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) {