Add staking keeper to migration

cosmos · Jun 10, 2024 · 575cfd3 · 575cfd3
1 parent a99ccb3
commit 575cfd3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/x/ccv/provider/migrations/migrator.go b/x/ccv/provider/migrations/migrator.go
@@ -4,21 +4,24 @@ import (
 	sdktypes "github.com/cosmos/cosmos-sdk/types"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
+	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper"
 	v3 "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations/v3"
 	v4 "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations/v4"
 	v5 "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations/v5"
+	v6 "github.com/cosmos/interchain-security/v4/x/ccv/provider/migrations/v6"
 )
 
 // Migrator is a struct for handling in-place store migrations.
 type Migrator struct {
 	providerKeeper providerkeeper.Keeper
+	stakingKeeper  stakingkeeper.Keeper
 	paramSpace     paramtypes.Subspace
 }
 
 // NewMigrator returns a new Migrator.
-func NewMigrator(providerKeeper providerkeeper.Keeper, paramSpace paramtypes.Subspace) Migrator {
-	return Migrator{providerKeeper: providerKeeper, paramSpace: paramSpace}
+func NewMigrator(providerKeeper providerkeeper.Keeper, stakingKeeper stakingkeeper.Keeper, paramSpace paramtypes.Subspace) Migrator {
+	return Migrator{providerKeeper: providerKeeper, stakingKeeper: stakingKeeper, paramSpace: paramSpace}
 }
 
 // Migrating consensus version 1 to 2 is a no-op.
@@ -47,3 +50,8 @@ func (m Migrator) Migrate4to5(ctx sdktypes.Context) error {
 	v5.MigrateTopNForRegisteredChains(ctx, m.providerKeeper)
 	return nil
 }
+
+func (m Migrator) Migrate5to6(ctx sdktypes.Context) error {
+	v6.MigrateMinPowerInTopN(ctx, m.providerKeeper, m.stakingKeeper)
+	return nil
+}
diff --git a/x/ccv/provider/migrations/v6/migrations.go b/x/ccv/provider/migrations/v6/migrations.go
@@ -7,7 +7,7 @@ import (
 	providerkeeper "github.com/cosmos/interchain-security/v4/x/ccv/provider/keeper"
 )
 
-func MigrateTopNForRegisteredChains(ctx sdk.Context, providerKeeper providerkeeper.Keeper, stakingKeeper stakingkeeper.Keeper) {
+func MigrateMinPowerInTopN(ctx sdk.Context, providerKeeper providerkeeper.Keeper, stakingKeeper stakingkeeper.Keeper) {
 	// get all consumer chains
 	registeredConsumerChains := providerKeeper.GetAllRegisteredAndProposedChainIDs(ctx)