refactor: replace interface{} with any for clarity and modernization (#2402)

black5box · web-flow · commit 8048c560d5ab · 2025-11-24T18:28:31.000+01:00
Signed-off-by: black5box &lt;black5box@outlook.com&gt;
diff --git a/app/sim_test.go b/app/sim_test.go
@@ -311,7 +311,7 @@ func TestAppStateDeterminism(t *testing.T) {
 
 	appOptions := viper.New()
 	if FlagEnableStreamingValue {
-		m := make(map[string]interface{})
+		m := make(map[string]any)
 		m["streaming.abci.keys"] = []string{"*"}
 		m["streaming.abci.plugin"] = "abci_v1"
 		m["streaming.abci.stop-node-on-err"] = true
diff --git a/cmd/wasmd/commands.go b/cmd/wasmd/commands.go
@@ -54,7 +54,7 @@ func initCometBFTConfig() *cmtcfg.Config {
 
 // initAppConfig helps to override default appConfig template and configs.
 // return "", nil if no custom configuration is required for the application.
-func initAppConfig() (string, interface{}) {
+func initAppConfig() (string, any) {
 	// The following code snippet is just for reference.
 
 	type CustomAppConfig struct {
diff --git a/tests/integration/common_test.go b/tests/integration/common_test.go
@@ -57,13 +57,13 @@ func must[t any](s t, err error) t {
 	return s
 }
 
-func mustUnmarshal(t *testing.T, data []byte, res interface{}) {
+func mustUnmarshal(t *testing.T, data []byte, res any) {
 	t.Helper()
 	err := json.Unmarshal(data, res)
 	require.NoError(t, err)
 }
 
-func mustMarshal(t *testing.T, r interface{}) []byte {
+func mustMarshal(t *testing.T, r any) []byte {
 	t.Helper()
 	bz, err := json.Marshal(r)
 	require.NoError(t, err)
diff --git a/tests/integration/module_test.go b/tests/integration/module_test.go
@@ -409,7 +409,7 @@ func TestHandleExecuteEscrow(t *testing.T) {
 	require.NoError(t, err)
 
 	bob := keyPubAddr()
-	initMsg := map[string]interface{}{
+	initMsg := map[string]any{
 		"verifier":    fred.String(),
 		"beneficiary": bob.String(),
 	}
@@ -429,8 +429,8 @@ func TestHandleExecuteEscrow(t *testing.T) {
 	contractBech32Addr := parseInitResponse(t, res.Data)
 	require.Equal(t, "cosmos14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s4hmalr", contractBech32Addr)
 
-	handleMsg := map[string]interface{}{
-		"release": map[string]interface{}{},
+	handleMsg := map[string]any{
+		"release": map[string]any{},
 	}
 	handleMsgBz, err := json.Marshal(handleMsg)
 	require.NoError(t, err)
@@ -533,9 +533,9 @@ func TestReadNodeConfig(t *testing.T) {
 	}
 }
 
-type AppOptionsMock map[string]interface{}
+type AppOptionsMock map[string]any
 
-func (a AppOptionsMock) Get(s string) interface{} {
+func (a AppOptionsMock) Get(s string) any {
 	return a[s]
 }
 
diff --git a/tests/wasmibctesting/utils.go b/tests/wasmibctesting/utils.go
@@ -244,7 +244,7 @@ func (chain *WasmTestChain) SendNonDefaultSenderMsgs(senderPrivKey cryptotypes.P
 // SmartQuery This will serialize the query message and submit it to the contract.
 // The response is parsed into the provided interface.
 // Usage: SmartQuery(addr, QueryMsg{Foo: 1}, &response)
-func (chain *WasmTestChain) SmartQuery(contractAddr string, queryMsg, response interface{}) error {
+func (chain *WasmTestChain) SmartQuery(contractAddr string, queryMsg, response any) error {
 	msg, err := json.Marshal(queryMsg)
 	if err != nil {
 		return err
diff --git a/x/wasm/keeper/ante_test.go b/x/wasm/keeper/ante_test.go
@@ -120,7 +120,7 @@ func TestLimitSimulationGasDecorator(t *testing.T) {
 		consumeGas  storetypes.Gas
 		maxBlockGas int64
 		simulation  bool
-		expErr      interface{}
+		expErr      any
 	}{
 		"custom limit set": {
 			customLimit: &hundred,
diff --git a/x/wasm/keeper/handler_plugin_encoders.go b/x/wasm/keeper/handler_plugin_encoders.go
@@ -397,7 +397,7 @@ func EncodeGovMsg(sender sdk.AccAddress, msg *wasmvmtypes.GovMsg) ([]sdk.Msg, er
 	}
 }
 
-func convertVoteOption(s interface{}) (v1.VoteOption, error) {
+func convertVoteOption(s any) (v1.VoteOption, error) {
 	var option v1.VoteOption
 	switch s {
 	case wasmvmtypes.Yes:
diff --git a/x/wasm/keeper/keeper_test.go b/x/wasm/keeper/keeper_test.go
@@ -1526,7 +1526,7 @@ func TestMigrateWithDispatchedMessage(t *testing.T) {
 	ctx = ctx.WithEventManager(sdk.NewEventManager()).WithBlockHeight(ctx.BlockHeight() + 1)
 	_, err = keeper.Migrate(ctx, contractAddr, fred, burnerContractID, migMsgBz)
 	require.NoError(t, err)
-	type dict map[string]interface{}
+	type dict map[string]any
 	expEvents := []dict{
 		{
 			"Type": "migrate",
@@ -1746,7 +1746,7 @@ func prettyEvents(t *testing.T, events sdk.Events) string {
 	return string(mustMarshal(t, r))
 }
 
-func mustMarshal(t *testing.T, r interface{}) []byte {
+func mustMarshal(t *testing.T, r any) []byte {
 	t.Helper()
 	bz, err := json.Marshal(r)
 	require.NoError(t, err)
diff --git a/x/wasm/keeper/reflect_test.go b/x/wasm/keeper/reflect_test.go
@@ -29,7 +29,7 @@ var (
 	ReflectCapabilities   = []string{"staking", "mask", "stargate", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0"}
 )
 
-func mustUnmarshal(t *testing.T, data []byte, res interface{}) {
+func mustUnmarshal(t *testing.T, data []byte, res any) {
 	t.Helper()
 	err := json.Unmarshal(data, res)
 	require.NoError(t, err)
diff --git a/x/wasm/keeper/test_fuzz.go b/x/wasm/keeper/test_fuzz.go
@@ -11,7 +11,7 @@ import (
 	"github.com/CosmWasm/wasmd/x/wasm/types"
 )
 
-var ModelFuzzers = []interface{}{FuzzAddr, FuzzAddrString, FuzzAbsoluteTxPosition, FuzzContractInfo, FuzzStateModel, FuzzAccessType, FuzzAccessConfig, FuzzContractCodeHistory}
+var ModelFuzzers = []any{FuzzAddr, FuzzAddrString, FuzzAbsoluteTxPosition, FuzzContractInfo, FuzzStateModel, FuzzAccessType, FuzzAccessConfig, FuzzContractCodeHistory}
 
 func FuzzAddr(m *sdk.AccAddress, c fuzz.Continue) {
 	*m = make([]byte, 20)
diff --git a/x/wasm/migrations/v2/legacy_types.go b/x/wasm/migrations/v2/legacy_types.go
@@ -316,7 +316,7 @@ var fileDescriptor_e6155d98fa173e02 = []byte{
 	0x00,
 }
 
-func (m *AccessTypeParam) Equal(that interface{}) bool {
+func (m *AccessTypeParam) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
@@ -341,7 +341,7 @@ func (m *AccessTypeParam) Equal(that interface{}) bool {
 	return true
 }
 
-func (m *AccessConfig) Equal(that interface{}) bool {
+func (m *AccessConfig) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
@@ -377,7 +377,7 @@ func (m *AccessConfig) Equal(that interface{}) bool {
 	return true
 }
 
-func (m *Params) Equal(that interface{}) bool {
+func (m *Params) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
@@ -405,7 +405,7 @@ func (m *Params) Equal(that interface{}) bool {
 	return true
 }
 
-func (m *CodeInfo) Equal(that interface{}) bool {
+func (m *CodeInfo) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
diff --git a/x/wasm/migrations/v2/params_legacy.go b/x/wasm/migrations/v2/params_legacy.go
@@ -38,7 +38,7 @@ func (p *Params) ParamSetPairs() paramtypes.ParamSetPairs {
 	}
 }
 
-func validateAccessConfig(i interface{}) error {
+func validateAccessConfig(i any) error {
 	v, ok := i.(AccessConfig)
 	if !ok {
 		return fmt.Errorf("invalid parameter type: %T", i)
@@ -53,7 +53,7 @@ var AllAccessTypes = []AccessType{
 	AccessTypeEverybody,
 }
 
-func validateAccessType(i interface{}) error {
+func validateAccessType(i any) error {
 	a, ok := i.(AccessType)
 	if !ok {
 		return fmt.Errorf("invalid parameter type: %T", i)
diff --git a/x/wasm/migrations/v3/legacy_types.go b/x/wasm/migrations/v3/legacy_types.go
@@ -317,7 +317,7 @@ var fileDescriptor_e6155d98fa173e02 = []byte{
 	0x00,
 }
 
-func (m *AccessTypeParam) Equal(that interface{}) bool {
+func (m *AccessTypeParam) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
@@ -342,7 +342,7 @@ func (m *AccessTypeParam) Equal(that interface{}) bool {
 	return true
 }
 
-func (m *AccessConfig) Equal(that interface{}) bool {
+func (m *AccessConfig) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
@@ -370,7 +370,7 @@ func (m *AccessConfig) Equal(that interface{}) bool {
 	return slices.Equal(m.Addresses, that1.Addresses)
 }
 
-func (m *Params) Equal(that interface{}) bool {
+func (m *Params) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
@@ -398,7 +398,7 @@ func (m *Params) Equal(that interface{}) bool {
 	return true
 }
 
-func (m *CodeInfo) Equal(that interface{}) bool {
+func (m *CodeInfo) Equal(that any) bool {
 	if that == nil {
 		return m == nil
 	}
diff --git a/x/wasm/types/errors.go b/x/wasm/types/errors.go
@@ -152,7 +152,7 @@ func (e WasmVMFlavouredError) Wrap(desc string) error { return errorsmod.Wrap(e,
 
 // Wrapf extends this error with additional information.
 // It's a handy function to call Wrapf with sdk errors.
-func (e WasmVMFlavouredError) Wrapf(desc string, args ...interface{}) error {
+func (e WasmVMFlavouredError) Wrapf(desc string, args ...any) error {
 	return errorsmod.Wrapf(e, desc, args...)
 }
 
diff --git a/x/wasm/types/json_matching.go b/x/wasm/types/json_matching.go
@@ -12,7 +12,7 @@ func isJSONObjectWithTopLevelKey(jsonBytes RawContractMessage, allowedKeys []str
 		return false, err
 	}
 
-	document := map[string]interface{}{}
+	document := map[string]any{}
 	if err := json.Unmarshal(jsonBytes, &document); err != nil {
 		return false, nil // not a map
 	}
diff --git a/x/wasm/types/json_matching_test.go b/x/wasm/types/json_matching_test.go
@@ -126,7 +126,7 @@ func TestIsJSONObjectWithTopLevelKey(t *testing.T) {
 func TestDuplicateKeyGivesSameResult(t *testing.T) {
 	jsonBytes := []byte(`{"event⑨thing": "foo", "event⑨thing":"bar"}`)
 	for i := 0; i < 10000; i++ {
-		document := map[string]interface{}{}
+		document := map[string]any{}
 		require.NoError(t, json.Unmarshal(jsonBytes, &document))
 		assert.Equal(t, "bar", document["event⑨thing"])
 	}
diff --git a/x/wasm/types/proposal_legacy.go b/x/wasm/types/proposal_legacy.go
@@ -119,7 +119,7 @@ func (p StoreCodeProposal) String() string {
 }
 
 // MarshalYAML pretty prints the wasm byte code
-func (p StoreCodeProposal) MarshalYAML() (interface{}, error) {
+func (p StoreCodeProposal) MarshalYAML() (any, error) {
 	return struct {
 		Title                 string        `yaml:"title"`
 		Description           string        `yaml:"description"`
@@ -202,7 +202,7 @@ func (p InstantiateContractProposal) String() string {
 }
 
 // MarshalYAML pretty prints the init message
-func (p InstantiateContractProposal) MarshalYAML() (interface{}, error) {
+func (p InstantiateContractProposal) MarshalYAML() (any, error) {
 	return struct {
 		Title       string    `yaml:"title"`
 		Description string    `yaml:"description"`
@@ -293,7 +293,7 @@ func (p InstantiateContract2Proposal) String() string {
 }
 
 // MarshalYAML pretty prints the init message
-func (p InstantiateContract2Proposal) MarshalYAML() (interface{}, error) {
+func (p InstantiateContract2Proposal) MarshalYAML() (any, error) {
 	return struct {
 		Title       string    `yaml:"title"`
 		Description string    `yaml:"description"`
@@ -393,7 +393,7 @@ func (p StoreAndInstantiateContractProposal) String() string {
 }
 
 // MarshalYAML pretty prints the wasm byte code and the init message
-func (p StoreAndInstantiateContractProposal) MarshalYAML() (interface{}, error) {
+func (p StoreAndInstantiateContractProposal) MarshalYAML() (any, error) {
 	return struct {
 		Title                 string        `yaml:"title"`
 		Description           string        `yaml:"description"`
@@ -466,7 +466,7 @@ func (p MigrateContractProposal) String() string {
 }
 
 // MarshalYAML pretty prints the migrate message
-func (p MigrateContractProposal) MarshalYAML() (interface{}, error) {
+func (p MigrateContractProposal) MarshalYAML() (any, error) {
 	return struct {
 		Title       string `yaml:"title"`
 		Description string `yaml:"description"`
@@ -519,7 +519,7 @@ func (p SudoContractProposal) String() string {
 }
 
 // MarshalYAML pretty prints the migrate message
-func (p SudoContractProposal) MarshalYAML() (interface{}, error) {
+func (p SudoContractProposal) MarshalYAML() (any, error) {
 	return struct {
 		Title       string `yaml:"title"`
 		Description string `yaml:"description"`
@@ -578,7 +578,7 @@ func (p ExecuteContractProposal) String() string {
 }
 
 // MarshalYAML pretty prints the migrate message
-func (p ExecuteContractProposal) MarshalYAML() (interface{}, error) {
+func (p ExecuteContractProposal) MarshalYAML() (any, error) {
 	return struct {
 		Title       string    `yaml:"title"`
 		Description string    `yaml:"description"`

Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,13 @@ func must[t any](s t, err error) t {`
`57`	`57`	`return s`
`58`	`58`	`}`
`59`	`59`
`60`		`-func mustUnmarshal(t *testing.T, data []byte, res interface{}) {`
	`60`	`+func mustUnmarshal(t *testing.T, data []byte, res any) {`
`61`	`61`	`t.Helper()`
`62`	`62`	`err := json.Unmarshal(data, res)`
`63`	`63`	`require.NoError(t, err)`
`64`	`64`	`}`
`65`	`65`
`66`		`-func mustMarshal(t *testing.T, r interface{}) []byte {`
	`66`	`+func mustMarshal(t *testing.T, r any) []byte {`
`67`	`67`	`t.Helper()`
`68`	`68`	`bz, err := json.Marshal(r)`
`69`	`69`	`require.NoError(t, err)`
Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ func TestHandleExecuteEscrow(t *testing.T) {`
`409`	`409`	`require.NoError(t, err)`
`410`	`410`
`411`	`411`	`bob := keyPubAddr()`
`412`		`- initMsg := map[string]interface{}{`
	`412`	`+ initMsg := map[string]any{`
`413`	`413`	`"verifier": fred.String(),`
`414`	`414`	`"beneficiary": bob.String(),`
`415`	`415`	`}`
`@@ -429,8 +429,8 @@ func TestHandleExecuteEscrow(t *testing.T) {`
`429`	`429`	`contractBech32Addr := parseInitResponse(t, res.Data)`
`430`	`430`	`require.Equal(t, "cosmos14hj2tavq8fpesdwxxcu44rty3hh90vhujrvcmstl4zr3txmfvw9s4hmalr", contractBech32Addr)`
`431`	`431`
`432`		`- handleMsg := map[string]interface{}{`
`433`		`- "release": map[string]interface{}{},`
	`432`	`+ handleMsg := map[string]any{`
	`433`	`+ "release": map[string]any{},`
`434`	`434`	`}`
`435`	`435`	`handleMsgBz, err := json.Marshal(handleMsg)`
`436`	`436`	`require.NoError(t, err)`
`@@ -533,9 +533,9 @@ func TestReadNodeConfig(t *testing.T) {`
`533`	`533`	`}`
`534`	`534`	`}`
`535`	`535`
`536`		`-type AppOptionsMock map[string]interface{}`
	`536`	`+type AppOptionsMock map[string]any`
`537`	`537`
`538`		`-func (a AppOptionsMock) Get(s string) interface{} {`
	`538`	`+func (a AppOptionsMock) Get(s string) any {`
`539`	`539`	`return a[s]`
`540`	`540`	`}`
`541`	`541`
Original file line number	Diff line number	Diff line change
`@@ -397,7 +397,7 @@ func EncodeGovMsg(sender sdk.AccAddress, msg *wasmvmtypes.GovMsg) ([]sdk.Msg, er`
`397`	`397`	`}`
`398`	`398`	`}`
`399`	`399`
`400`		`-func convertVoteOption(s interface{}) (v1.VoteOption, error) {`
	`400`	`+func convertVoteOption(s any) (v1.VoteOption, error) {`
`401`	`401`	`var option v1.VoteOption`
`402`	`402`	`switch s {`
`403`	`403`	`case wasmvmtypes.Yes:`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ var (`
`29`	`29`	`ReflectCapabilities = []string{"staking", "mask", "stargate", "cosmwasm_1_1", "cosmwasm_1_2", "cosmwasm_1_3", "cosmwasm_1_4", "cosmwasm_2_0"}`
`30`	`30`	`)`
`31`	`31`
`32`		`-func mustUnmarshal(t *testing.T, data []byte, res interface{}) {`
	`32`	`+func mustUnmarshal(t *testing.T, data []byte, res any) {`
`33`	`33`	`t.Helper()`
`34`	`34`	`err := json.Unmarshal(data, res)`
`35`	`35`	`require.NoError(t, err)`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`"github.com/CosmWasm/wasmd/x/wasm/types"`
`12`	`12`	`)`
`13`	`13`
`14`		`-var ModelFuzzers = []interface{}{FuzzAddr, FuzzAddrString, FuzzAbsoluteTxPosition, FuzzContractInfo, FuzzStateModel, FuzzAccessType, FuzzAccessConfig, FuzzContractCodeHistory}`
	`14`	`+var ModelFuzzers = []any{FuzzAddr, FuzzAddrString, FuzzAbsoluteTxPosition, FuzzContractInfo, FuzzStateModel, FuzzAccessType, FuzzAccessConfig, FuzzContractCodeHistory}`
`15`	`15`
`16`	`16`	`func FuzzAddr(m *sdk.AccAddress, c fuzz.Continue) {`
`17`	`17`	`*m = make([]byte, 20)`