TrueCloudLab/frostfs-node
20
1
Fork 28
Code Issues 107 Pull requests 4 Projects Releases 2 Packages 4 Activity Actions

[#556] morph/container: Do not parse public key in Put event parser

Browse source 
Morph event structures defined in `pkg/morph/event` should only carry
notification values without any additional interpretation. All logical work
should be concentrated on app-side. Change `Bind.User` / `Unbind.User` to
return byte slice. Change `Bind.Keys` / `Unbind.Keys` to return `[][]byte`.
`ParseBind` / `ParseUnbind` don't decode data from now.

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
This commit is contained in:
Leonard Lyubich 2021-05-31 21:09:02 +03:00 • committed by Alex Vanin
parent 55c83454b6
commit f76083484b
4 changed files with 59 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

51
pkg/morph/event/neofs/unbind.go
View file

@ -1,68 +1,23 @@
package neofs
import (
"crypto/elliptic"
"fmt"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neo-go/pkg/vm/stackitem"
"github.com/nspcc-dev/neofs-node/pkg/morph/client"
"github.com/nspcc-dev/neofs-node/pkg/morph/event"
)
type Unbind struct {
user util.Uint160
keys []*keys.PublicKey
bindCommon
}
// MorphEvent implements Neo:Morph Event interface.
func (Unbind) MorphEvent() {}
func (u Unbind) Keys() []*keys.PublicKey { return u.keys }
func (u Unbind) User() util.Uint160 { return u.user }
func ParseUnbind(params []stackitem.Item) (event.Event, error) {
var (
ev Unbind
err error
)
if ln := len(params); ln != 2 {
return nil, event.WrongNumberOfParameters(2, ln)
}
// parse user
user, err := client.BytesFromStackItem(params[0])
err = parseBind(&ev.bindCommon, params)
if err != nil {
return nil, fmt.Errorf("could not get bind user: %w", err)
}
ev.user, err = util.Uint160DecodeBytesBE(user)
if err != nil {
return nil, fmt.Errorf("could not convert unbind user to uint160: %w", err)
}
// parse keys
unbindKeys, err := client.ArrayFromStackItem(params[1])
if err != nil {
return nil, fmt.Errorf("could not get unbind keys: %w", err)
}
ev.keys = make([]*keys.PublicKey, 0, len(unbindKeys))
for i := range unbindKeys {
rawKey, err := client.BytesFromStackItem(unbindKeys[i])
if err != nil {
return nil, fmt.Errorf("could not get unbind public key: %w", err)
}
key, err := keys.NewPublicKeyFromBytes(rawKey, elliptic.P256())
if err != nil {
return nil, fmt.Errorf("could not parse unbind public key: %w", err)
}
ev.keys = append(ev.keys, key)
return nil, err
}
return ev, nil