From 516c99444178077be4a107486d53c24567b00d59 Mon Sep 17 00:00:00 2001 From: Jack Zampolin Date: Wed, 1 Sep 2021 15:36:54 -0700 Subject: [PATCH] Push main @jackzampolin: remove orchestrator check --- module/cmd/gravity/cmd/gentx.go | 7 +------ module/cmd/gravity/cmd/root.go | 3 +-- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/module/cmd/gravity/cmd/gentx.go b/module/cmd/gravity/cmd/gentx.go index 7f9c7ad93..e646acbd9 100644 --- a/module/cmd/gravity/cmd/gentx.go +++ b/module/cmd/gravity/cmd/gentx.go @@ -41,7 +41,7 @@ import ( ) // GenTxCmd builds the application's gentx command. -func GenTxCmd(mbm module.BasicManager, txEncCfg client.TxEncodingConfig, genBalIterator types.GenesisBalancesIterator, genAccountIterator authtypes.GenesisAccountIterator, defaultNodeHome string) *cobra.Command { +func GenTxCmd(mbm module.BasicManager, txEncCfg client.TxEncodingConfig, genBalIterator types.GenesisBalancesIterator, defaultNodeHome string) *cobra.Command { ipDefault, _ := server.ExternalIP() fsCreateValidator, defaultsDesc := cli.CreateValidatorMsgFlagSet(ipDefault) @@ -149,11 +149,6 @@ $ %s gentx my-key-name 1000000stake 0x033030FEeBd93E3178487c35A9c8cA80874353C9 c return errors.Wrap(err, "failed to validate validator account in genesis") } - // validate orchestrator account in genesis and warn if not found - if err = validateAccountPresentInGenesis(genesisState, genAccountIterator, orchAddress, coins, cdc); err != nil { - cmd.PrintErrf("orchestrator address not found in genesis file: %s\n", orchAddress) - } - txFactory := tx.NewFactoryCLI(clientCtx, cmd.Flags()) if err != nil { return errors.Wrap(err, "error creating tx builder") diff --git a/module/cmd/gravity/cmd/root.go b/module/cmd/gravity/cmd/root.go index 4c00cdbcd..bce8087b2 100644 --- a/module/cmd/gravity/cmd/root.go +++ b/module/cmd/gravity/cmd/root.go @@ -19,7 +19,6 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" authcmd "github.com/cosmos/cosmos-sdk/x/auth/client/cli" "github.com/cosmos/cosmos-sdk/x/auth/types" - authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" vestingcli "github.com/cosmos/cosmos-sdk/x/auth/vesting/client/cli" banktypes "github.com/cosmos/cosmos-sdk/x/bank/types" "github.com/cosmos/cosmos-sdk/x/crisis" @@ -91,7 +90,7 @@ func initRootCmd(rootCmd *cobra.Command, encodingConfig params.EncodingConfig) { genutilcli.InitCmd(app.ModuleBasics, app.DefaultNodeHome), CollectGenTxsCmd(banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome), genutilcli.MigrateGenesisCmd(), - GenTxCmd(app.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, authtypes.GenesisAccountIterator{}, app.DefaultNodeHome), + GenTxCmd(app.ModuleBasics, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, app.DefaultNodeHome), genutilcli.ValidateGenesisCmd(app.ModuleBasics), AddGenesisAccountCmd(app.DefaultNodeHome), tmcli.NewCompletionCmd(rootCmd, true),