mkadilov/frostfs-node
1
0
Fork 0
forked from TrueCloudLab/frostfs-node
Code Pull requests Activity

[#932] adm: Move DomainOf to util package

Browse source 
Signed-off-by: Anton Nikiforov <an.nikiforov@yadro.com>
This commit is contained in:
Anton Nikiforov 2024-02-01 09:58:12 +03:00
parent 34fcab3498
commit fdeb99c52f
19 changed files with 36 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cmd/frostfs-adm/internal/modules/morph/initialize.go
View file

@ -122,7 +122,7 @@ func newInitializeContext(cmd *cobra.Command, v *viper.Viper) (*initializeContex
return nil, err
}
committeeAcc, err := morphUtil.GetWalletAccount(wallets[0], committeeAccountName)
committeeAcc, err := morphUtil.GetWalletAccount(wallets[0], morphUtil.CommitteeAccountName)
if err != nil {
return nil, fmt.Errorf("can't find committee account: %w", err)
}
@ -237,7 +237,7 @@ func getContractsPath(cmd *cobra.Command, needContracts bool) (string, error) {
func createWalletAccounts(wallets []*wallet.Wallet) ([]*wallet.Account, error) {
accounts := make([]*wallet.Account, len(wallets))
for i, w := range wallets {
acc, err := morphUtil.GetWalletAccount(w, singleAccountName)
acc, err := morphUtil.GetWalletAccount(w, morphUtil.SingleAccountName)
if err != nil {
return nil, fmt.Errorf("wallet %s is invalid (no single account): %w", w.Path(), err)
}
@ -346,7 +346,7 @@ func (c *initializeContext) sendMultiTx(script []byte, tryGroup bool, withConsen
return fmt.Errorf("could not perform test invocation: %w", err)
}
if err := c.multiSign(tx, committeeAccountName); err != nil {
if err := c.multiSign(tx, morphUtil.CommitteeAccountName); err != nil {
return err
}
if withConsensus {