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

[#732] neofs-adm: fetch native hashes once

Browse source 
Retrieve list of native contracts during initialization
in a single query.

Signed-off-by: Evgenii Stratonikov <evgeniy@nspcc.ru>
This commit is contained in:
Evgenii Stratonikov 2021-07-29 16:35:57 +03:00 • committed by Alex Vanin
parent 6a40adcfca
commit c81008764a
6 changed files with 26 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cmd/neofs-adm/internal/modules/morph/initialize_transfer.go
View file

@ -28,14 +28,8 @@ func (c *initializeContext) transferFunds() error {
return err
}
gasHash, err := c.Client.GetNativeContractHash(nativenames.Gas)
if err != nil {
return fmt.Errorf("can't fetch %s hash: %w", nativenames.Gas, err)
}
neoHash, err := c.Client.GetNativeContractHash(nativenames.Neo)
if err != nil {
return fmt.Errorf("can't fetch %s hash: %w", nativenames.Neo, err)
}
gasHash := c.nativeHash(nativenames.Gas)
neoHash := c.nativeHash(nativenames.Neo)
var transfers []client.TransferTarget
for _, w := range c.Wallets {
@ -87,10 +81,7 @@ func (c *initializeContext) transferFunds() error {
}
func (c *initializeContext) transferFundsFinished() (bool, error) {
gasHash, err := c.Client.GetNativeContractHash(nativenames.Gas)
if err != nil {
return false, err
}
gasHash := c.nativeHash(nativenames.Gas)
acc, err := getWalletAccount(c.Wallets[0], singleAccountName)
if err != nil {
@ -150,11 +141,7 @@ func (c *initializeContext) multiSign(tx *transaction.Transaction, accType strin
}
func (c *initializeContext) transferGASToProxy() error {
gasHash, err := c.Client.GetNativeContractHash(nativenames.Gas)
if err != nil {
return fmt.Errorf("can't fetch %s hash: %w", nativenames.Gas, err)
}
gasHash := c.nativeHash(nativenames.Gas)
cs, err := c.readContract(proxyContract)
if err != nil {
return err