From 58d04e2996c7845d6e494b944c10f4d6f01748bd Mon Sep 17 00:00:00 2001 From: Levi Schoen Date: Thu, 15 Feb 2024 10:03:40 -0800 Subject: [PATCH] register solomachine module for v6 to v7 ibc-go migration (#1830) --- app/app.go | 2 ++ app/app_test.go | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/app.go b/app/app.go index 64575657..af963dc2 100644 --- a/app/app.go +++ b/app/app.go @@ -89,6 +89,7 @@ import ( porttypes "github.com/cosmos/ibc-go/v7/modules/core/05-port/types" ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported" ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper" + solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" evmante "github.com/evmos/ethermint/app/ante" ethermintconfig "github.com/evmos/ethermint/server/config" @@ -197,6 +198,7 @@ var ( slashing.AppModuleBasic{}, ibc.AppModuleBasic{}, ibctm.AppModuleBasic{}, + solomachine.AppModuleBasic{}, upgrade.AppModuleBasic{}, evidence.AppModuleBasic{}, authzmodule.AppModuleBasic{}, diff --git a/app/app_test.go b/app/app_test.go index e5d32cfe..20ee39be 100644 --- a/app/app_test.go +++ b/app/app_test.go @@ -17,6 +17,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/migrations/legacytx" vestingtypes "github.com/cosmos/cosmos-sdk/x/auth/vesting/types" + solomachine "github.com/cosmos/ibc-go/v7/modules/light-clients/06-solomachine" ibctm "github.com/cosmos/ibc-go/v7/modules/light-clients/07-tendermint" evmtypes "github.com/evmos/ethermint/x/evm/types" "github.com/stretchr/testify/assert" @@ -151,7 +152,7 @@ func unmarshalJSONKeys(jsonBytes []byte) ([]string, error) { func removeIbcTmModule(modules []string) []string { var result []string for _, str := range modules { - if str != ibctm.ModuleName { + if str != ibctm.ModuleName && str != solomachine.ModuleName { result = append(result, str) } }