From 9ef2579afab1027ffde309b88f360c8cfe5cb999 Mon Sep 17 00:00:00 2001 From: Evgenii Stratonikov Date: Wed, 28 Jul 2021 17:34:59 +0300 Subject: [PATCH] [#726] neofs-adm: remove alphabet contract from contract list Signed-off-by: Evgenii Stratonikov --- .../internal/modules/morph/initialize_deploy.go | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go b/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go index bbcad065..f6c1b945 100644 --- a/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go +++ b/cmd/neofs-adm/internal/modules/morph/initialize_deploy.go @@ -32,7 +32,6 @@ const ( ) var contractList = []string{ - alphabetContract, auditContract, balanceContract, containerContract, @@ -118,7 +117,11 @@ func (c *initializeContext) deployContracts() error { return err } - cs := c.Contracts[alphabetContract] + cs, err := c.readContract(ctrPath, alphabetContract) + if err != nil { + return err + } + ctrHash := state.CreateContractHash(acc.Contract.ScriptHash(), cs.NEF.Checksum, cs.Manifest.Name) if _, err := c.Client.GetContractStateByHash(ctrHash); err == nil { c.Command.Printf("Stage 4: alphabet contract #%d is already deployed.\n", i) @@ -152,10 +155,6 @@ func (c *initializeContext) deployContracts() error { } for _, ctrName := range contractList { - if ctrName == alphabetContract { - continue - } - cs := c.Contracts[ctrName] if _, err := c.Client.GetContractStateByHash(cs.Hash); err == nil { c.Command.Printf("Stage 4: %s contract is already deployed.\n", ctrName)