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

[#1100] *: Adopt new SDK's owner.ID API

Browse source 
Signed-off-by: Pavel Karpy <carpawell@nspcc.ru>
This commit is contained in:
Pavel Karpy 2022-01-21 15:15:10 +03:00 • committed by Alex Vanin
parent 4b5404047c
commit fee2f5a330
21 changed files with 32 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

12
pkg/innerring/processors/container/common.go
View file

@ -52,17 +52,7 @@ func (cp *Processor) checkKeyOwnership(ownerIDSrc ownerIDSource, key *keys.Publi
}
}
// TODO: need more convenient way to do this
w, err := owner.NEO3WalletFromPublicKey(&ecdsa.PublicKey{
Curve: key.Curve,
X: key.X,
Y: key.Y,
})
if err != nil {
return err
}
if ownerIDSrc.OwnerID().Equal(owner.NewIDFromNeo3Wallet(w)) {
if ownerIDSrc.OwnerID().Equal(owner.NewIDFromPublicKey((*ecdsa.PublicKey)(key))) {
return nil
}

10
pkg/innerring/processors/settlement/audit/calculate.go
View file

@ -319,13 +319,5 @@ func ownerFromKey(key []byte) (*owner.ID, error) {
return nil, err
}
n3wallet, err := owner.NEO3WalletFromPublicKey((*ecdsa.PublicKey)(pubKey))
if err != nil {
return nil, err
}
o := owner.NewID()
o.SetNeo3Wallet(n3wallet)
return o, nil
return owner.NewIDFromPublicKey((*ecdsa.PublicKey)(pubKey)), nil
}

11
pkg/innerring/processors/settlement/basic/context.go
View file

@ -4,7 +4,6 @@ import (
"math/big"
"sync"
"github.com/mr-tron/base58"
"github.com/nspcc-dev/neo-go/pkg/encoding/address"
"github.com/nspcc-dev/neo-go/pkg/util"
"github.com/nspcc-dev/neofs-node/pkg/innerring/processors/settlement/common"
@ -85,16 +84,12 @@ func bankOwnerID() (*owner.ID, error) {
u := util.Uint160{1, 1, 1, 1, 1, 1, 1, 1, 1, 1, // todo: define const
1, 1, 1, 1, 1, 1, 1, 1, 1, 1}
d, err := base58.Decode(address.Uint160ToString(u))
o := owner.NewID()
err := o.Parse(address.Uint160ToString(u))
if err != nil {
return nil, err
}
var w owner.NEO3Wallet
copy(w[:], d)
o := owner.NewID()
o.SetNeo3Wallet(&w)
return o, nil
}