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

[#883] adm: Add domainOf function to resolve NNS domain
All checks were successful
Vulncheck / Vulncheck (pull_request) Successful in 2m49s
Details
DCO action / DCO (pull_request) Successful in 2m38s
Details
Build / Build Components (1.21) (pull_request) Successful in 3m51s
Details
Build / Build Components (1.20) (pull_request) Successful in 3m59s
Details
Tests and linters / Staticcheck (pull_request) Successful in 4m59s
Details
Tests and linters / Lint (pull_request) Successful in 5m59s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 8m45s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 8m47s
Details
Tests and linters / Tests with -race (pull_request) Successful in 4m15s
Details

Browse source 
Signed-off-by: Alex Vanin <a.vanin@yadro.com>
This commit is contained in:
Alexey Vanin 2023-12-21 13:59:46 +03:00
parent ac0821a1a5
commit b1eab1de54
10 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cmd/frostfs-adm/internal/modules/morph/container.go
View file

@ -35,7 +35,7 @@ func getContainerContractHash(cmd *cobra.Command, inv *invoker.Invoker) (util.Ui
if err != nil {
return util.Uint160{}, fmt.Errorf("can't get NNS contract state: %w", err)
}
ch, err = nnsResolveHash(inv, nnsCs.Hash, containerContract+".frostfs")
ch, err = nnsResolveHash(inv, nnsCs.Hash, domainOf(containerContract))
if err != nil {
return util.Uint160{}, err
}
@ -306,7 +306,7 @@ func fetchContainerContractHash(wCtx *initializeContext) (util.Uint160, error) {
return util.Uint160{}, fmt.Errorf("can't get NNS contract state: %w", err)
}
ch, err := nnsResolveHash(wCtx.ReadOnlyInvoker, nnsCs.Hash, containerContract+".frostfs")
ch, err := nnsResolveHash(wCtx.ReadOnlyInvoker, nnsCs.Hash, domainOf(containerContract))
if err != nil {
return util.Uint160{}, fmt.Errorf("can't fetch container contract hash: %w", err)
}