key as type

cosmos · May 22, 2024 · baae5d4 · baae5d4
1 parent 7c4e602
commit baae5d4
Show file tree

Hide file tree

Showing 11 changed files with 59 additions and 59 deletions.
diff --git a/client/cmd.go b/client/cmd.go
@@ -379,7 +379,7 @@ func SetCmdClientContext(cmd *cobra.Command, clientCtx Context) error {
 }
 
 func GetViperFromCmd(cmd *cobra.Command) *viper.Viper {
-	value := cmd.Context().Value(corectx.ViperContextKey)
+	value := cmd.Context().Value(corectx.ViperContextKey{})
 	v, ok := value.(*viper.Viper)
 	if !ok {
 		return viper.New()
@@ -388,7 +388,7 @@ func GetViperFromCmd(cmd *cobra.Command) *viper.Viper {
 }
 
 func GetConfigFromCmd(cmd *cobra.Command) *cmtcfg.Config {
-	v := cmd.Context().Value(corectx.ViperContextKey)
+	v := cmd.Context().Value(corectx.ViperContextKey{})
 	viper, ok := v.(*viper.Viper)
 	if !ok {
 		return cmtcfg.DefaultConfig()
@@ -397,7 +397,7 @@ func GetConfigFromCmd(cmd *cobra.Command) *cmtcfg.Config {
 }
 
 func GetLoggerFromCmd(cmd *cobra.Command) log.Logger {
-	v := cmd.Context().Value(corectx.LoggerContextKey)
+	v := cmd.Context().Value(corectx.LoggerContextKey{})
 	logger, ok := v.(log.Logger)
 	if !ok {
 		return log.NewLogger(cmd.OutOrStdout())

diff --git a/core/context/server_context.go b/core/context/server_context.go
@@ -1,6 +1,6 @@
 package context
 
-var (
+type (
 	LoggerContextKey struct{}
-	ViperContextKey  struct{}
+	ViperContextKey struct{}
 )
diff --git a/server/cmd/execute.go b/server/cmd/execute.go
@@ -43,8 +43,8 @@ func Execute(rootCmd *cobra.Command, envPrefix, defaultHome string) error {
 func CreateExecuteContext(ctx context.Context) context.Context {
 	// srvCtx := server.NewDefaultContext()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &client.Context{})
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	return ctx
 }
diff --git a/server/util.go b/server/util.go
@@ -187,7 +187,7 @@ func CreateSDKLogger(v *viper.Viper, out io.Writer) (log.Logger, error) {
 // if it has not been set.
 func GetServerContextFromCmd(cmd *cobra.Command) *LegacyContext {
 	serverCtx := &LegacyContext{}
-	if v := cmd.Context().Value(corectx.ViperContextKey); v != nil {
+	if v := cmd.Context().Value(corectx.ViperContextKey{}); v != nil {
 		viper := v.(*viper.Viper)
 		serverCtx.Viper = viper
 		serverCtx.Config = client.GetConfigFromViper(viper)
@@ -196,13 +196,13 @@ func GetServerContextFromCmd(cmd *cobra.Command) *LegacyContext {
 		serverCtx.Config = cmtcfg.DefaultConfig()
 	}
 
-	if v := cmd.Context().Value(corectx.LoggerContextKey); v != nil {
+	if v := cmd.Context().Value(corectx.LoggerContextKey{}); v != nil {
 		logger := v.(log.Logger)
 		serverCtx.Logger = logger
 	} else {
 		serverCtx.Logger = log.NewLogger(cmd.OutOrStdout())
 	}
-	
+
 	return serverCtx
 }
 
@@ -217,8 +217,8 @@ func SetCmdServerContext(cmd *cobra.Command, viper *viper.Viper, logger log.Logg
 		cmdCtx = cmd.Context()
 	}
 
-	cmd.SetContext(context.WithValue(cmdCtx, corectx.LoggerContextKey, logger))
-	cmd.SetContext(context.WithValue(cmdCtx, corectx.ViperContextKey, viper))
+	cmd.SetContext(context.WithValue(cmdCtx, corectx.LoggerContextKey{}, logger))
+	cmd.SetContext(context.WithValue(cmdCtx, corectx.ViperContextKey{}, viper))
 
 	return nil
 }

diff --git a/server/util_test.go b/server/util_test.go
@@ -62,8 +62,8 @@ func TestInterceptConfigsPreRunHandlerCreatesConfigFilesWhenMissing(t *testing.T
 
 	cmd.PreRunE = preRunETestImpl
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 	if err := cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
 	}
@@ -106,7 +106,7 @@ func TestInterceptConfigsPreRunHandlerCreatesConfigFilesWhenMissing(t *testing.T
 	}
 
 	// Test that the config for use in server/start.go is created
-	v := ctx.Value(corectx.ViperContextKey)
+	v := ctx.Value(corectx.ViperContextKey{})
 	viper, _ := v.(*viper.Viper)
 
 	if viper == nil {
@@ -144,8 +144,8 @@ func TestInterceptConfigsPreRunHandlerReadsConfigToml(t *testing.T) {
 
 	cmd.PreRunE = preRunETestImpl
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -184,8 +184,8 @@ func TestInterceptConfigsPreRunHandlerReadsAppToml(t *testing.T) {
 
 	cmd.PreRunE = preRunETestImpl
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -214,8 +214,8 @@ func TestInterceptConfigsPreRunHandlerReadsFlags(t *testing.T) {
 
 	cmd.PreRunE = preRunETestImpl
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -252,8 +252,8 @@ func TestInterceptConfigsPreRunHandlerReadsEnvVars(t *testing.T) {
 
 	cmd.PreRunE = preRunETestImpl
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -361,8 +361,8 @@ func TestInterceptConfigsPreRunHandlerPrecedenceFlag(t *testing.T) {
 	testCommon := newPrecedenceCommon(t)
 	testCommon.setAll(t, &TestAddrExpected, &TestAddrNotExpected, &TestAddrNotExpected)
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := testCommon.cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -379,8 +379,8 @@ func TestInterceptConfigsPreRunHandlerPrecedenceEnvVar(t *testing.T) {
 	testCommon := newPrecedenceCommon(t)
 	testCommon.setAll(t, nil, &TestAddrExpected, &TestAddrNotExpected)
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := testCommon.cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -397,8 +397,8 @@ func TestInterceptConfigsPreRunHandlerPrecedenceConfigFile(t *testing.T) {
 	testCommon := newPrecedenceCommon(t)
 	testCommon.setAll(t, nil, nil, &TestAddrExpected)
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := testCommon.cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -415,8 +415,8 @@ func TestInterceptConfigsPreRunHandlerPrecedenceConfigDefault(t *testing.T) {
 	testCommon := newPrecedenceCommon(t)
 	// Do not set anything
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewLogger(os.Stdout))
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := testCommon.cmd.ExecuteContext(ctx); !errors.Is(err, errCanceledInPreRun) {
 		t.Fatalf("function failed with [%T] %v", err, err)
@@ -446,8 +446,8 @@ func TestInterceptConfigsWithBadPermissions(t *testing.T) {
 
 	cmd.PreRunE = preRunETestImpl
 
-	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey, log.NewNopLogger())
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper.New())
+	ctx := context.WithValue(context.Background(), corectx.LoggerContextKey{}, log.NewNopLogger())
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper.New())
 
 	if err := cmd.ExecuteContext(ctx); !os.IsPermission(err) {
 		t.Fatalf("Failed to catch permissions error, got: [%T] %v", err, err)
@@ -464,8 +464,8 @@ func TestEmptyMinGasPrices(t *testing.T) {
 	clientCtx := client.Context{}.WithHomeDir(tempDir).WithCodec(encCfg.Codec)
 	viper := viper.New()
 	viper.Set(flags.FlagHome, tempDir)
-	ctx := context.WithValue(context.Background(), corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, log.NewLogger(os.Stdout))
+	ctx := context.WithValue(context.Background(), corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, log.NewLogger(os.Stdout))
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
 	cmd := genutilcli.InitCmd(module.NewManager())
 	cmd.SetArgs([]string{"appnode-test"})

diff --git a/simapp/simd/cmd/testnet_test.go b/simapp/simd/cmd/testnet_test.go
@@ -68,8 +68,8 @@ func Test_TestnetCmd(t *testing.T) {
 		WithValidatorAddressCodec(cdcOpts.GetValidatorCodec())
 
 	ctx := context.Background()
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
 	cmd := testnetInitFilesCmd(moduleManager, banktypes.GenesisBalancesIterator{})
 	cmd.SetArgs([]string{fmt.Sprintf("--%s=test", flags.FlagKeyringBackend), fmt.Sprintf("--output-dir=%s", home)})

diff --git a/tests/e2e/genutil/export_test.go b/tests/e2e/genutil/export_test.go
@@ -59,7 +59,7 @@ func TestExportCmd_ConsensusParams(t *testing.T) {
 func TestExportCmd_HomeDir(t *testing.T) {
 	_, ctx, _, cmd := setupApp(t, t.TempDir())
 
-	v := ctx.Value(corectx.ViperContextKey)
+	v := ctx.Value(corectx.ViperContextKey{})
 	viper, ok := v.(*viper.Viper)
 	require.True(t, ok)
 	viper.Set(flags.FlagHome, "foobar")
@@ -220,7 +220,7 @@ func setupApp(t *testing.T, tempDir string) (*simapp.SimApp, context.Context, ge
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
 
 	return app, ctx, appGenesis, cmd
 }

diff --git a/x/genutil/client/cli/export_test.go b/x/genutil/client/cli/export_test.go
@@ -74,8 +74,8 @@ func NewExportSystem(t *testing.T, exporter types.AppExporter) *ExportSystem {
 
 	cCtx := (client.Context{}).WithHomeDir(homeDir)
 
-	ctx := context.WithValue(context.Background(), corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx := context.WithValue(context.Background(), corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	ctx = context.WithValue(ctx, client.ClientContextKey, &cCtx)
 

diff --git a/x/genutil/client/cli/genaccount_test.go b/x/genutil/client/cli/genaccount_test.go
@@ -92,8 +92,8 @@ func TestAddGenesisAccountCmd(t *testing.T) {
 
 			ctx := context.Background()
 			ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-			ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-			ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+			ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+			ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 			cmd := genutilcli.AddGenesisAccountCmd(addresscodec.NewBech32Codec("cosmos"))
 			cmd.SetArgs([]string{

diff --git a/x/genutil/client/cli/init_test.go b/x/genutil/client/cli/init_test.go
@@ -77,8 +77,8 @@ func TestInitCmd(t *testing.T) {
 
 			ctx := context.Background()
 			ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-			ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-			ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+			ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+			ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 			cmd := genutilcli.InitCmd(testMbm)
 			cmd.SetArgs(
@@ -111,8 +111,8 @@ func TestInitRecover(t *testing.T) {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	cmd := genutilcli.InitCmd(testMbm)
 	cmd.SetContext(ctx)
@@ -144,8 +144,8 @@ func TestInitDefaultBondDenom(t *testing.T) {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	cmd := genutilcli.InitCmd(testMbm)
 
@@ -172,8 +172,8 @@ func TestEmptyState(t *testing.T) {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	cmd := genutilcli.InitCmd(testMbm)
 	cmd.SetArgs([]string{"appnode-test"})
@@ -267,8 +267,8 @@ func TestInitConfig(t *testing.T) {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	cmd := genutilcli.InitCmd(testMbm)
 	cmd.SetArgs([]string{"testnode"})
@@ -317,8 +317,8 @@ func TestInitWithHeight(t *testing.T) {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	testInitialHeight := int64(333)
 
@@ -354,8 +354,8 @@ func TestInitWithNegativeHeight(t *testing.T) {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	testInitialHeight := int64(-333)
 

diff --git a/x/genutil/client/testutil/helpers.go b/x/genutil/client/testutil/helpers.go
@@ -35,8 +35,8 @@ func ExecInitCmd(mm *module.Manager, home string, cdc codec.Codec) error {
 
 	ctx := context.Background()
 	ctx = context.WithValue(ctx, client.ClientContextKey, &clientCtx)
-	ctx = context.WithValue(ctx, corectx.ViperContextKey, viper)
-	ctx = context.WithValue(ctx, corectx.LoggerContextKey, logger)
+	ctx = context.WithValue(ctx, corectx.ViperContextKey{}, viper)
+	ctx = context.WithValue(ctx, corectx.LoggerContextKey{}, logger)
 
 	cmd.SetArgs([]string{"appnode-test"})