[#1541] morph/event: Simplify netmap contract event parsing
All checks were successful
Tests and linters / Run gofumpt (push) Successful in 1m10s
Vulncheck / Vulncheck (push) Successful in 2m55s
Tests and linters / Staticcheck (push) Successful in 3m2s
Build / Build Components (push) Successful in 3m42s
Pre-commit hooks / Pre-commit (push) Successful in 3m46s
Tests and linters / Lint (push) Successful in 4m19s
Tests and linters / Tests (push) Successful in 4m23s
Tests and linters / gopls check (push) Successful in 4m44s
Tests and linters / Tests with -race (push) Successful in 5m18s
All checks were successful
Tests and linters / Run gofumpt (push) Successful in 1m10s
Vulncheck / Vulncheck (push) Successful in 2m55s
Tests and linters / Staticcheck (push) Successful in 3m2s
Build / Build Components (push) Successful in 3m42s
Pre-commit hooks / Pre-commit (push) Successful in 3m46s
Tests and linters / Lint (push) Successful in 4m19s
Tests and linters / Tests (push) Successful in 4m23s
Tests and linters / gopls check (push) Successful in 4m44s
Tests and linters / Tests with -race (push) Successful in 5m18s
Signed-off-by: Evgenii Stratonikov <e.stratonikov@yadro.com>
This commit is contained in:
parent
a353d45742
commit
1c12f23b84
2 changed files with 6 additions and 18 deletions
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
Loading…
Reference in a new issue