genutil using client helper

decentrio · May 10, 2024 · 64a6ec6 · 64a6ec6
1 parent 0fe9762
commit 64a6ec6
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 22 deletions.
diff --git a/x/genutil/client/cli/collect.go b/x/genutil/client/cli/collect.go
@@ -8,7 +8,6 @@ import (
 
 	"cosmossdk.io/errors"
 
-	corectx "cosmossdk.io/core/context"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/x/genutil"
 	"github.com/cosmos/cosmos-sdk/x/genutil/types"
@@ -22,8 +21,7 @@ func CollectGenTxsCmd(genBalIterator types.GenesisBalancesIterator, validator ty
 		Use:   "collect-gentxs",
 		Short: "Collect genesis txs and output a genesis.json file",
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			serverCtx := corectx.GetServerContextFromCmd(cmd)
-			config := serverCtx.GetConfig()
+			config := client.GetConfigFromCmd(cmd)
 
 			clientCtx := client.GetClientContextFromCmd(cmd)
 			cdc := clientCtx.Codec

diff --git a/x/genutil/client/cli/export.go b/x/genutil/client/cli/export.go
@@ -9,7 +9,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	corectx "cosmossdk.io/core/context"
+	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -32,14 +32,15 @@ func ExportCmd(appExporter servertypes.AppExporter) *cobra.Command {
 		Short: "Export state to JSON",
 		Args:  cobra.NoArgs,
 		RunE: func(cmd *cobra.Command, _ []string) error {
-			serverCtx := corectx.GetServerContextFromCmd(cmd)
-			config := serverCtx.GetConfig()
+			config := client.GetConfigFromCmd(cmd)
+			viper := client.GetViperFromCmd(cmd)
+			logger := client.GetLoggerFromCmd(cmd)
 
 			if _, err := os.Stat(config.GenesisFile()); os.IsNotExist(err) {
 				return err
 			}
 
-			db, err := server.OpenDB(config.RootDir, server.GetAppDBBackend(serverCtx.GetViper()))
+			db, err := server.OpenDB(config.RootDir, server.GetAppDBBackend(viper))
 			if err != nil {
 				return err
 			}
@@ -67,7 +68,7 @@ func ExportCmd(appExporter servertypes.AppExporter) *cobra.Command {
 			}
 
 			traceWriterFile, _ := cmd.Flags().GetString(flagTraceStore)
-			traceWriter, cleanup, err := server.SetupTraceWriter(serverCtx.GetLogger(), traceWriterFile) //resleak:notresource
+			traceWriter, cleanup, err := server.SetupTraceWriter(logger, traceWriterFile) //resleak:notresource
 			if err != nil {
 				return err
 			}
@@ -79,7 +80,7 @@ func ExportCmd(appExporter servertypes.AppExporter) *cobra.Command {
 			modulesToExport, _ := cmd.Flags().GetStringSlice(flagModulesToExport)
 			outputDocument, _ := cmd.Flags().GetString(flags.FlagOutputDocument)
 
-			exported, err := appExporter(serverCtx.GetLogger(), db, traceWriter, height, forZeroHeight, jailAllowedAddrs, serverCtx.GetViper(), modulesToExport)
+			exported, err := appExporter(logger, db, traceWriter, height, forZeroHeight, jailAllowedAddrs, viper, modulesToExport)
 			if err != nil {
 				return fmt.Errorf("error exporting state: %w", err)
 			}

diff --git a/x/genutil/client/cli/genaccount.go b/x/genutil/client/cli/genaccount.go
@@ -8,7 +8,6 @@ import (
 
 	"cosmossdk.io/core/address"
 
-	corectx "cosmossdk.io/core/context"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/crypto/keyring"
@@ -38,8 +37,7 @@ contain valid denominations. Accounts may optionally be supplied with vesting pa
 		Args: cobra.ExactArgs(2),
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
-			serverCtx := corectx.GetServerContextFromCmd(cmd)
-			config := serverCtx.GetConfig()
+			config := client.GetConfigFromCmd(cmd)
 
 			var kr keyring.Keyring
 			addr, err := addressCodec.StringToBytes(args[0])

diff --git a/x/genutil/client/cli/gentx.go b/x/genutil/client/cli/gentx.go
@@ -16,7 +16,6 @@ import (
 	authclient "cosmossdk.io/x/auth/client"
 	"cosmossdk.io/x/staking/client/cli"
 
-	corectx "cosmossdk.io/core/context"
 	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/client/flags"
 	"github.com/cosmos/cosmos-sdk/client/tx"
@@ -56,15 +55,15 @@ $ %s gentx my-key-name 1000000stake --home=/path/to/home/dir --keyring-backend=o
 `, defaultsDesc, version.AppName,
 		),
 		RunE: func(cmd *cobra.Command, args []string) error {
-			serverCtx := corectx.GetServerContextFromCmd(cmd)
 			clientCtx, err := client.GetClientTxContext(cmd)
 			if err != nil {
 				return err
 			}
 			cdc := clientCtx.Codec
-			config := serverCtx.GetConfig()
 
-			nodeID, valPubKey, err := genutil.InitializeNodeValidatorFiles(serverCtx.GetConfig())
+			config := client.GetConfigFromCmd(cmd)
+
+			nodeID, valPubKey, err := genutil.InitializeNodeValidatorFiles(config)
 			if err != nil {
 				return errors.Wrap(err, "failed to initialize node validator files")
 			}

diff --git a/x/genutil/client/cli/init.go b/x/genutil/client/cli/init.go
@@ -13,7 +13,6 @@ import (
 	"github.com/cosmos/go-bip39"
 	"github.com/spf13/cobra"
 
-	corectx "cosmossdk.io/core/context"
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math/unsafe"
 
@@ -84,8 +83,7 @@ func InitCmd(mm hasDefaultGenesis) *cobra.Command {
 		RunE: func(cmd *cobra.Command, args []string) error {
 			clientCtx := client.GetClientContextFromCmd(cmd)
 
-			serverCtx := corectx.GetServerContextFromCmd(cmd)
-			config := serverCtx.GetConfig()
+			config := client.GetConfigFromCmd(cmd)
 
 			chainID, _ := cmd.Flags().GetString(flags.FlagChainID)
 			switch {

diff --git a/x/genutil/client/cli/validate_genesis.go b/x/genutil/client/cli/validate_genesis.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/spf13/cobra"
 
-	corectx "cosmossdk.io/core/context"
+	"github.com/cosmos/cosmos-sdk/client"
 	"github.com/cosmos/cosmos-sdk/types/module"
 	"github.com/cosmos/cosmos-sdk/x/genutil/types"
 )
@@ -21,12 +21,12 @@ func ValidateGenesisCmd(mm *module.Manager) *cobra.Command {
 		Args:    cobra.RangeArgs(0, 1),
 		Short:   "Validates the genesis file at the default location or at the location passed as an arg",
 		RunE: func(cmd *cobra.Command, args []string) (err error) {
-			serverCtx := corectx.GetServerContextFromCmd(cmd)
+			config := client.GetConfigFromCmd(cmd)
 
 			// Load default if passed no args, otherwise load passed file
 			var genesis string
 			if len(args) == 0 {
-				genesis = serverCtx.GetConfig().GenesisFile()
+				genesis = config.GenesisFile()
 			} else {
 				genesis = args[0]
 			}