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

5
cmd/neofs-cli/modules/accounting.go
View file

@ -41,10 +41,7 @@ var accountingBalanceCmd = &cobra.Command{
exitOnErr(cmd, err)
if balanceOwner == "" {
wallet, err := owner.NEO3WalletFromPublicKey(&key.PublicKey)
exitOnErr(cmd, err)
oid = owner.NewIDFromNeo3Wallet(wallet)
oid = owner.NewIDFromPublicKey(&key.PublicKey)
} else {
oid, err = ownerFromString(balanceOwner)
exitOnErr(cmd, err)

5
cmd/neofs-cli/modules/container.go
View file

@ -116,10 +116,7 @@ var listContainersCmd = &cobra.Command{
exitOnErr(cmd, err)
if containerOwner == "" {
wallet, err := owner.NEO3WalletFromPublicKey(&key.PublicKey)
exitOnErr(cmd, err)
oid = owner.NewIDFromNeo3Wallet(wallet)
oid = owner.NewIDFromPublicKey(&key.PublicKey)
} else {
oid, err = ownerFromString(containerOwner)
exitOnErr(cmd, err)

8
cmd/neofs-cli/modules/object.go
View file

@ -594,13 +594,7 @@ func getObjectHash(cmd *cobra.Command, _ []string) {
}
func getOwnerID(key *ecdsa.PrivateKey) (*owner.ID, error) {
w, err := owner.NEO3WalletFromPublicKey(&key.PublicKey)
if err != nil {
return nil, err
}
ownerID := owner.NewID()
ownerID.SetNeo3Wallet(w)
return ownerID, nil
return owner.NewIDFromPublicKey(&key.PublicKey), nil
}
var searchUnaryOpVocabulary = map[string]object.SearchMatchType{