test: Enable upgrade integration tests, Fix lint

b-harvest · Aug 8, 2024 · 64dad86 · 64dad86
1 parent c0c558d
commit 64dad86
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -88,8 +88,7 @@ jobs:
     timeout-minutes: 60
     strategy:
       matrix:
-        # tests: [unmarked, upgrade, filter]
-        tests: [unmarked, filter]
+        tests: [unmarked, upgrade, filter]
     env:
       TESTS_TO_RUN: ${{ matrix.tests }}
     steps:

diff --git a/app/app.go b/app/app.go
@@ -748,7 +748,7 @@ func NewEthermintApp(
 
 	// RegisterUpgradeHandlers is used for registering any on-chain upgrades.
 	// Make sure it's called after `app.mm` and `app.configurator` are set.
-	app.RegisterUpgradeHandlers(app.appCodec, app.IBCKeeper.ClientKeeper, app.ConsensusParamsKeeper, app.ParamsKeeper)
+	app.RegisterUpgradeHandlers(app.appCodec, app.IBCKeeper.ClientKeeper, app.ConsensusParamsKeeper)
 
 	autocliv1.RegisterQueryServer(app.GRPCQueryRouter(), runtimeservices.NewAutoCLIQueryService(app.ModuleManager.Modules))
 

diff --git a/app/upgrades.go b/app/upgrades.go
@@ -35,7 +35,6 @@ import (
 	govtypes "github.com/cosmos/cosmos-sdk/x/gov/types"
 	govv1 "github.com/cosmos/cosmos-sdk/x/gov/types/v1"
 	minttypes "github.com/cosmos/cosmos-sdk/x/mint/types"
-	paramskeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
 	paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
 	slashingtypes "github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@@ -50,7 +49,6 @@ func (app *EthermintApp) RegisterUpgradeHandlers(
 	cdc codec.BinaryCodec,
 	clientKeeper clientkeeper.Keeper,
 	consensusParamsKeeper consensusparamskeeper.Keeper,
-	paramsKeeper paramskeeper.Keeper,
 ) {
 	planName := "integration-test-upgrade"
 	// Set param key table for params module migration