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

[#932] adm: Rename util to helper
All checks were successful
Vulncheck / Vulncheck (pull_request) Successful in 1m57s
Details
DCO action / DCO (pull_request) Successful in 3m3s
Details
Build / Build Components (1.21) (pull_request) Successful in 5m0s
Details
Build / Build Components (1.20) (pull_request) Successful in 5m6s
Details
Tests and linters / Tests (1.20) (pull_request) Successful in 7m1s
Details
Tests and linters / Staticcheck (pull_request) Successful in 6m55s
Details
Tests and linters / Lint (pull_request) Successful in 7m30s
Details
Tests and linters / Tests (1.21) (pull_request) Successful in 7m53s
Details
Tests and linters / Tests with -race (pull_request) Successful in 8m21s
Details

Browse source 
To avoid conflicts with `util` packages in other imports.

Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
Anton Nikiforov 2024-02-02 15:36:14 +03:00
parent e2cee4cf09
commit 802192cfef
34 changed files with 144 additions and 144 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/frostfs-adm/internal/modules/morph/generate/generate.go
View file

@ -9,7 +9,7 @@ import (
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/commonflags"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/config"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/constants"
morphUtil "git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/util"
"git.frostfs.info/TrueCloudLab/frostfs-node/cmd/frostfs-adm/internal/modules/morph/helper"
"git.frostfs.info/TrueCloudLab/frostfs-node/pkg/innerring"
"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
"github.com/nspcc-dev/neo-go/pkg/encoding/address"
@ -36,7 +36,7 @@ func AlphabetCreds(cmd *cobra.Command, _ []string) error {
return errors.New("size must be > 0")
}
if size > constants.MaxAlphabetNodes {
return morphUtil.ErrTooManyAlphabetNodes
return helper.ErrTooManyAlphabetNodes
}
v := viper.GetViper()
@ -46,7 +46,7 @@ func AlphabetCreds(cmd *cobra.Command, _ []string) error {
return err
}
_, err = morphUtil.InitializeContractWallet(v, walletDir)
_, err = helper.InitializeContractWallet(v, walletDir)
if err != nil {
return err
}
@ -191,12 +191,12 @@ func refillGas(cmd *cobra.Command, gasFlag string, createWallet bool) (err error
gasStr := viper.GetString(gasFlag)
gasAmount, err := morphUtil.ParseGASAmount(gasStr)
gasAmount, err := helper.ParseGASAmount(gasStr)
if err != nil {
return err
}
wCtx, err := morphUtil.NewInitializeContext(cmd, viper.GetViper())
wCtx, err := helper.NewInitializeContext(cmd, viper.GetViper())
if err != nil {
return err
}