From e3c0a034cefe7189ed1d11918651176f61217f4f Mon Sep 17 00:00:00 2001 From: Hieu Vu <72878483+hieuvubk@users.noreply.github.com> Date: Thu, 23 May 2024 19:31:17 +0700 Subject: [PATCH] rename --- CHANGELOG.md | 2 +- server/util.go | 3 --- simapp/simd/cmd/testnet_test.go | 2 +- tests/e2e/genutil/export_test.go | 2 +- testutil/network/util.go | 2 +- x/genutil/client/cli/init_test.go | 2 +- x/genutil/client/testutil/helpers.go | 6 +++--- x/genutil/collect_test.go | 3 --- 8 files changed, 8 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6875a68e65bf..dcbae6d38f79 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -119,7 +119,7 @@ Every module contains its own CHANGELOG.md. Please refer to the module you are i ### API Breaking Changes -* (server) [#20422](https://github.com/cosmos/cosmos-sdk/pull/20422) Remove `cmtcfg.Config` from `ServerContext`. To get `cmtcfg.Config` from cmd, use `client.GetConfigFromCmd(cmd)` instead of `server.GetServerContextFromCmd(cmd).Config` +* (server) [#20422](https://github.com/cosmos/cosmos-sdk/pull/20422) Deprecated `ServerContext`. To get `cmtcfg.Config` from cmd, use `client.GetCometConfigFromCmd(cmd)` instead of `server.GetServerContextFromCmd(cmd).Config` * (types)[#20369](https://github.com/cosmos/cosmos-sdk/pull/20369) The signature of `HasAminoCodec` has changed to accept a `core/legacy.Amino` interface instead of `codec.LegacyAmino`. * (x/simulation)[#20056](https://github.com/cosmos/cosmos-sdk/pull/20056) `SimulateFromSeed` now takes an address codec as argument. * (x/crisis) [#20043](https://github.com/cosmos/cosmos-sdk/pull/20043) Changed `NewMsgVerifyInvariant` to accept a string as argument instead of an `AccAddress`. diff --git a/server/util.go b/server/util.go index af218b9f769e..ccb081395099 100644 --- a/server/util.go +++ b/server/util.go @@ -231,8 +231,6 @@ func SetCmdServerContext(cmd *cobra.Command, serverCtx *Context) error { cmd.SetContext(cmdCtx) - fmt.Println("After set", serverCtx.Viper.GetString(flags.FlagHome)) - return nil } @@ -243,7 +241,6 @@ func SetCmdServerContext(cmd *cobra.Command, serverCtx *Context) error { // viperCfg object. func interceptConfigs(rootViper *viper.Viper, customAppTemplate string, customConfig interface{}, cmtConfig *cmtcfg.Config) (*cmtcfg.Config, error) { rootDir := rootViper.GetString(flags.FlagHome) - fmt.Println("Init root", rootDir) configPath := filepath.Join(rootDir, "config") cmtCfgFile := filepath.Join(configPath, "config.toml") diff --git a/simapp/simd/cmd/testnet_test.go b/simapp/simd/cmd/testnet_test.go index 524d7d01c523..fee803721e52 100644 --- a/simapp/simd/cmd/testnet_test.go +++ b/simapp/simd/cmd/testnet_test.go @@ -58,7 +58,7 @@ func Test_TestnetCmd(t *testing.T) { err = genutiltest.ExecInitCmd(moduleManager, home, encodingConfig.Codec) require.NoError(t, err) - err = genutiltest.WriteAndTrackConfig(viper, home, cfg) + err = genutiltest.WriteAndTrackCometConfig(viper, home, cfg) require.NoError(t, err) clientCtx := client.Context{}. WithCodec(encodingConfig.Codec). diff --git a/tests/e2e/genutil/export_test.go b/tests/e2e/genutil/export_test.go index 611df3671ccf..febda09efcff 100644 --- a/tests/e2e/genutil/export_test.go +++ b/tests/e2e/genutil/export_test.go @@ -175,7 +175,7 @@ func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, ge assert.NilError(t, err) viper := viper.New() - err = gentestutil.WriteAndTrackConfig(viper, tempDir, cmtcfg.DefaultConfig()) + err = gentestutil.WriteAndTrackCometConfig(viper, tempDir, cmtcfg.DefaultConfig()) assert.NilError(t, err) clientCtx := client.Context{}.WithCodec(app.AppCodec()) diff --git a/testutil/network/util.go b/testutil/network/util.go index 14a6196189d6..a3662bf6ea67 100644 --- a/testutil/network/util.go +++ b/testutil/network/util.go @@ -171,7 +171,7 @@ func collectGenFiles(cfg Config, vals []*Validator, cmtConfigs []*cmtcfg.Config, } v := vals[i].GetViper() - err = genutiltest.TrackConfig(v, nodeDir) + err = genutiltest.TrackCometConfig(v, nodeDir) if err != nil { return err } diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go index b3a8b648764e..b57bba44cd50 100644 --- a/x/genutil/client/cli/init_test.go +++ b/x/genutil/client/cli/init_test.go @@ -388,5 +388,5 @@ func writeAndTrackDefaultConfig(v *viper.Viper, home string) error { if err != nil { return err } - return genutiltest.WriteAndTrackConfig(v, home, cfg) + return genutiltest.WriteAndTrackCometConfig(v, home, cfg) } diff --git a/x/genutil/client/testutil/helpers.go b/x/genutil/client/testutil/helpers.go index 77560ad16d1f..54df530e86ce 100644 --- a/x/genutil/client/testutil/helpers.go +++ b/x/genutil/client/testutil/helpers.go @@ -24,7 +24,7 @@ func ExecInitCmd(mm *module.Manager, home string, cdc codec.Codec) error { viper := viper.New() cmd := genutilcli.InitCmd(mm) cfg, _ := CreateDefaultCometConfig(home) - err := WriteAndTrackConfig(viper, home, cfg) + err := WriteAndTrackCometConfig(viper, home, cfg) if err != nil { return err } @@ -55,7 +55,7 @@ func CreateDefaultCometConfig(rootDir string) (*cmtcfg.Config, error) { return conf, nil } -func WriteAndTrackConfig(v *viper.Viper, home string, cfg *cmtcfg.Config) error { +func WriteAndTrackCometConfig(v *viper.Viper, home string, cfg *cmtcfg.Config) error { cmtcfg.WriteConfigFile(filepath.Join(home, "config", "config.toml"), cfg) v.Set(flags.FlagHome, home) @@ -65,7 +65,7 @@ func WriteAndTrackConfig(v *viper.Viper, home string, cfg *cmtcfg.Config) error return v.ReadInConfig() } -func TrackConfig(v *viper.Viper, home string) error { +func TrackCometConfig(v *viper.Viper, home string) error { v.Set(flags.FlagHome, home) v.SetConfigType("toml") v.SetConfigName("config") diff --git a/x/genutil/collect_test.go b/x/genutil/collect_test.go index fea26e1ecb96..15215076fd4c 100644 --- a/x/genutil/collect_test.go +++ b/x/genutil/collect_test.go @@ -53,9 +53,6 @@ func TestCollectTxsHandlesDirectories(t *testing.T) { }) // 2. Ensure that we don't encounter any error traversing the directory. - // What is this for??? - // srvCtx := server.NewDefaultContext() - // _ = srvCtx cdc := codec.NewProtoCodec(cdctypes.NewInterfaceRegistry()) genesis := &types.AppGenesis{AppState: []byte("{}")} balItr := new(doNothingIterator)