diff --git a/x/upgrade/keeper/grpc_query_test.go b/x/upgrade/keeper/grpc_query_test.go index 30a7e4f1ef..7120a10f68 100644 --- a/x/upgrade/keeper/grpc_query_test.go +++ b/x/upgrade/keeper/grpc_query_test.go @@ -9,7 +9,6 @@ import ( "cosmossdk.io/core/header" storetypes "cosmossdk.io/store/types" - govtypes "cosmossdk.io/x/gov/types" "cosmossdk.io/x/upgrade" "cosmossdk.io/x/upgrade/keeper" "cosmossdk.io/x/upgrade/types" @@ -42,7 +41,7 @@ func (suite *UpgradeTestSuite) SetupTest() { suite.ctx = testCtx.Ctx skipUpgradeHeights := make(map[int64]bool) - authority, err := addresscodec.NewBech32Codec("cosmos").BytesToString(authtypes.NewModuleAddress(govtypes.ModuleName)) + authority, err := addresscodec.NewBech32Codec("cosmos").BytesToString(authtypes.NewModuleAddress(govModuleName)) suite.Require().NoError(err) suite.encodedAuthority = authority suite.upgradeKeeper = keeper.NewKeeper(skipUpgradeHeights, storeService, suite.encCfg.Codec, suite.T().TempDir(), nil, authority) diff --git a/x/upgrade/keeper/keeper_test.go b/x/upgrade/keeper/keeper_test.go index ec7a882e0d..1c2f5f6e01 100644 --- a/x/upgrade/keeper/keeper_test.go +++ b/x/upgrade/keeper/keeper_test.go @@ -12,7 +12,6 @@ import ( "cosmossdk.io/core/header" "cosmossdk.io/log" storetypes "cosmossdk.io/store/types" - govtypes "cosmossdk.io/x/gov/types" "cosmossdk.io/x/upgrade" "cosmossdk.io/x/upgrade/keeper" "cosmossdk.io/x/upgrade/types" @@ -28,6 +27,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) +const govModuleName = "gov" + type KeeperTestSuite struct { suite.Suite @@ -66,7 +67,7 @@ func (s *KeeperTestSuite) SetupTest() { homeDir := filepath.Join(s.T().TempDir(), "x_upgrade_keeper_test") ac := addresscodec.NewBech32Codec("cosmos") - authority, err := ac.BytesToString(authtypes.NewModuleAddress(govtypes.ModuleName)) + authority, err := ac.BytesToString(authtypes.NewModuleAddress(govModuleName)) s.Require().NoError(err) s.encodedAuthority = authority s.upgradeKeeper = keeper.NewKeeper(skipUpgradeHeights, storeService, s.encCfg.Codec, homeDir, s.baseApp, authority) diff --git a/x/upgrade/module.go b/x/upgrade/module.go index c077b33547..3df57d1141 100644 --- a/x/upgrade/module.go +++ b/x/upgrade/module.go @@ -14,7 +14,6 @@ import ( "cosmossdk.io/core/appmodule" "cosmossdk.io/core/store" "cosmossdk.io/depinject" - govtypes "cosmossdk.io/x/gov/types" "cosmossdk.io/x/upgrade/client/cli" "cosmossdk.io/x/upgrade/keeper" "cosmossdk.io/x/upgrade/types" @@ -30,6 +29,8 @@ import ( authtypes "github.com/cosmos/cosmos-sdk/x/auth/types" ) +const govModuleName = "gov" + func init() { types.RegisterLegacyAminoCodec(codec.NewLegacyAmino()) } @@ -206,7 +207,7 @@ func ProvideModule(in ModuleInputs) ModuleOutputs { } // default to governance authority if not provided - authority := authtypes.NewModuleAddress(govtypes.ModuleName) + authority := authtypes.NewModuleAddress(govModuleName) if in.Config.Authority != "" { authority = authtypes.NewModuleAddressOrBech32Address(in.Config.Authority) }