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

Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
---
 pkg/morph/event/balance/lock.go      | 68 +++++-----------------------
 pkg/morph/event/balance/lock_test.go |  3 +-
 2 files changed, 13 insertions(+), 58 deletions(-)

diff --git a/pkg/morph/event/balance/lock.go b/pkg/morph/event/balance/lock.go
index 062a2a88..99f80584 100644
--- a/pkg/morph/event/balance/lock.go
+++ b/pkg/morph/event/balance/lock.go
@@ -3,7 +3,7 @@ package balance
 import (
 	"fmt"
 
-	"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/morph/client"
+	"git.frostfs.info/TrueCloudLab/frostfs-contract/rpcclient/balance"
 	"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"
@@ -47,61 +47,17 @@ func (l Lock) TxHash() util.Uint256 { return l.txHash }
 
 // ParseLock from notification into lock structure.
 func ParseLock(e *state.ContainedNotificationEvent) (event.Event, error) {
-	var (
-		ev  Lock
-		err error
-	)
-
-	params, err := event.ParseStackArray(e)
-	if err != nil {
-		return nil, fmt.Errorf("could not parse stack items from notify event: %w", err)
+	var le balance.LockEvent
+	if err := le.FromStackItem(e.Item); err != nil {
+		return nil, fmt.Errorf("parse balance.LockEvent: %w", err)
 	}
 
-	if ln := len(params); ln != 5 {
-		return nil, event.WrongNumberOfParameters(5, ln)
-	}
-
-	// parse id
-	ev.id, err = client.BytesFromStackItem(params[0])
-	if err != nil {
-		return nil, fmt.Errorf("could not get lock id: %w", err)
-	}
-
-	// parse user
-	user, err := client.BytesFromStackItem(params[1])
-	if err != nil {
-		return nil, fmt.Errorf("could not get lock user value: %w", err)
-	}
-
-	ev.user, err = util.Uint160DecodeBytesBE(user)
-	if err != nil {
-		return nil, fmt.Errorf("could not convert lock user value to uint160: %w", err)
-	}
-
-	// parse lock account
-	lock, err := client.BytesFromStackItem(params[2])
-	if err != nil {
-		return nil, fmt.Errorf("could not get lock account value: %w", err)
-	}
-
-	ev.lock, err = util.Uint160DecodeBytesBE(lock)
-	if err != nil {
-		return nil, fmt.Errorf("could not convert lock account value to uint160: %w", err)
-	}
-
-	// parse amount
-	ev.amount, err = client.IntFromStackItem(params[3])
-	if err != nil {
-		return nil, fmt.Errorf("could not get lock amount: %w", err)
-	}
-
-	// parse until deadline
-	ev.until, err = client.IntFromStackItem(params[4])
-	if err != nil {
-		return nil, fmt.Errorf("could not get lock deadline: %w", err)
-	}
-
-	ev.txHash = e.Container
-
-	return ev, nil
+	return Lock{
+		id:     le.TxID,
+		user:   le.From,
+		lock:   le.To,
+		amount: le.Amount.Int64(),
+		until:  le.Until.Int64(),
+		txHash: e.Container,
+	}, nil
 }
diff --git a/pkg/morph/event/balance/lock_test.go b/pkg/morph/event/balance/lock_test.go
index 9199bcd5..87b91aed 100644
--- a/pkg/morph/event/balance/lock_test.go
+++ b/pkg/morph/event/balance/lock_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/core/state"
 	"github.com/nspcc-dev/neo-go/pkg/util"
 	"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
@@ -28,7 +27,7 @@ func TestParseLock(t *testing.T) {
 		}
 
 		_, err := ParseLock(createNotifyEventFromItems(prms))
-		require.EqualError(t, err, event.WrongNumberOfParameters(5, len(prms)).Error())
+		require.Error(t, err)
 	})
 
 	t.Run("wrong id parameter", func(t *testing.T) {