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

[#1607] adm/ape: Fix parsing policy-hash flag
All checks were successful
DCO action / DCO (pull_request) Successful in 37s
Details
Vulncheck / Vulncheck (pull_request) Successful in 59s
Details
Build / Build Components (pull_request) Successful in 1m24s
Details
Pre-commit hooks / Pre-commit (pull_request) Successful in 1m28s
Details
Tests and linters / Run gofumpt (pull_request) Successful in 2m37s
Details
Tests and linters / Tests (pull_request) Successful in 2m56s
Details
Tests and linters / Lint (pull_request) Successful in 3m3s
Details
Tests and linters / gopls check (pull_request) Successful in 3m50s
Details
Tests and linters / Tests with -race (pull_request) Successful in 3m53s
Details
Tests and linters / Staticcheck (pull_request) Successful in 6m11s
Details

Browse source 
Signed-off-by: Denis Kirillov <d.kirillov@yadro.com>
This commit is contained in:
Denis Kirillov 2025-03-03 09:53:03 +03:00
parent 01b19e72fa
commit 10574f8ff0
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cmd/frostfs-adm/internal/modules/morph/ape/chains/list_user.go
View file

@ -180,12 +180,18 @@ func initReaders(cmd *cobra.Command) (*invoker.Invoker, util.Uint160, *ffsidclie
commonCmd.ExitOnErr(cmd, "can't get NNS contract state: %w", err)
policyHashStr, _ := cmd.Flags().GetString(policyHashFlag)
policyHash, err := helper.NNSResolveHash(inv, nnsCs.Hash, policyHashStr)
commonCmd.ExitOnErr(cmd, "can't resolve NNS policy contract: %w", err)
policyHash, err := util.Uint160DecodeStringLE(policyHashStr)
if err != nil {
policyHash, err = helper.NNSResolveHash(inv, nnsCs.Hash, policyHashStr)
commonCmd.ExitOnErr(cmd, "can't resolve NNS policy contract: %w", err)
}
frostfsidHashStr, _ := cmd.Flags().GetString(frostfsidHashFlag)
frostfsidHash, err := helper.NNSResolveHash(inv, nnsCs.Hash, frostfsidHashStr)
commonCmd.ExitOnErr(cmd, "can't resolve NNS frostfsid contract: %w", err)
frostfsidHash, err := util.Uint160DecodeStringLE(policyHashStr)
if err != nil {
frostfsidHash, err = helper.NNSResolveHash(inv, nnsCs.Hash, frostfsidHashStr)
commonCmd.ExitOnErr(cmd, "can't resolve NNS frostfsid contract: %w", err)
}
acc, err := wallet.NewAccount()
commonCmd.ExitOnErr(cmd, "can't create new account: %w", err)

7
cmd/frostfs-adm/internal/modules/morph/ape/raw/list_targets.go
View file

@ -84,10 +84,15 @@ func initPolicyReader(cmd *cobra.Command) (*invoker.Invoker, util.Uint160) {
commonCmd.ExitOnErr(cmd, "can't init rpc client: %w", err)
inv := invoker.New(rpcCli, nil)
policyHashStr, _ := cmd.Flags().GetString(policyHashFlag)
if policyHash, err := util.Uint160DecodeStringLE(policyHashStr); err == nil {
return inv, policyHash
}
nnsCs, err := helper.GetContractByID(management.NewReader(inv), 1)
commonCmd.ExitOnErr(cmd, "can't get NNS contract state: %w", err)
policyHashStr, _ := cmd.Flags().GetString(policyHashFlag)
policyHash, err := helper.NNSResolveHash(inv, nnsCs.Hash, policyHashStr)
commonCmd.ExitOnErr(cmd, "can't resolve NNS policy contract: %w", err)