chore: remove direct reliance on staking from slashing (backport #12177…

…) (#12181)
cosmos · Jun 7, 2022 · 95d873f · 95d873f
1 parent bec98b5
commit 95d873f
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 16 deletions.
diff --git a/x/distribution/module.go b/x/distribution/module.go
@@ -23,7 +23,6 @@ import (
  "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
  "github.com/cosmos/cosmos-sdk/x/distribution/simulation"
  "github.com/cosmos/cosmos-sdk/x/distribution/types"
- stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 )
 
 var (
@@ -95,13 +94,13 @@ type AppModule struct {
  keeper keeper.Keeper
  accountKeeper types.AccountKeeper
  bankKeeper types.BankKeeper
- stakingKeeper stakingkeeper.Keeper
+ stakingKeeper types.StakingKeeper
 }
 
 // NewAppModule creates a new AppModule object
 func NewAppModule(
  cdc codec.Codec, keeper keeper.Keeper, accountKeeper types.AccountKeeper,
- bankKeeper types.BankKeeper, stakingKeeper stakingkeeper.Keeper,
+ bankKeeper types.BankKeeper, stakingKeeper types.StakingKeeper,
 ) AppModule {
  return AppModule{
  AppModuleBasic: AppModuleBasic{cdc: cdc},

diff --git a/x/distribution/simulation/operations.go b/x/distribution/simulation/operations.go
@@ -24,11 +24,7 @@ const (
 )
 
 // WeightedOperations returns all the operations from the module with their respective weights
-func WeightedOperations(
- appParams simtypes.AppParams, cdc codec.JSONCodec, ak types.AccountKeeper,
- bk types.BankKeeper, k keeper.Keeper, sk stakingkeeper.Keeper,
-) simulation.WeightedOperations {
-
+func WeightedOperations(appParams simtypes.AppParams, cdc codec.JSONCodec, ak types.AccountKeeper, bk types.BankKeeper, k keeper.Keeper, sk types.StakingKeeper) simulation.WeightedOperations {
  var weightMsgSetWithdrawAddress int
  appParams.GetOrGenerate(cdc, OpWeightMsgSetWithdrawAddress, &weightMsgSetWithdrawAddress, nil,
  func(_ *rand.Rand) {
@@ -57,22 +53,24 @@ func WeightedOperations(
  },
  )
 
+ stakeKeeper := sk.(stakingkeeper.Keeper)
+
  return simulation.WeightedOperations{
  simulation.NewWeightedOperation(
  weightMsgSetWithdrawAddress,
  SimulateMsgSetWithdrawAddress(ak, bk, k),
  ),
  simulation.NewWeightedOperation(
  weightMsgWithdrawDelegationReward,
- SimulateMsgWithdrawDelegatorReward(ak, bk, k, sk),
+ SimulateMsgWithdrawDelegatorReward(ak, bk, k, stakeKeeper),
  ),
  simulation.NewWeightedOperation(
  weightMsgWithdrawValidatorCommission,
- SimulateMsgWithdrawValidatorCommission(ak, bk, k, sk),
+ SimulateMsgWithdrawValidatorCommission(ak, bk, k, stakeKeeper),
  ),
  simulation.NewWeightedOperation(
  weightMsgFundCommunityPool,
- SimulateMsgFundCommunityPool(ak, bk, k, sk),
+ SimulateMsgFundCommunityPool(ak, bk, k, stakeKeeper),
  ),
  }
 }

diff --git a/x/slashing/module.go b/x/slashing/module.go
@@ -24,7 +24,6 @@ import (
  "github.com/cosmos/cosmos-sdk/x/slashing/keeper"
  "github.com/cosmos/cosmos-sdk/x/slashing/simulation"
  "github.com/cosmos/cosmos-sdk/x/slashing/types"
- stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 )
 
 var (
@@ -98,11 +97,11 @@ type AppModule struct {
  keeper keeper.Keeper
  accountKeeper types.AccountKeeper
  bankKeeper types.BankKeeper
- stakingKeeper stakingkeeper.Keeper
+ stakingKeeper types.StakingKeeper
 }
 
 // NewAppModule creates a new AppModule object
-func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak types.AccountKeeper, bk types.BankKeeper, sk stakingkeeper.Keeper) AppModule {
+func NewAppModule(cdc codec.Codec, keeper keeper.Keeper, ak types.AccountKeeper, bk types.BankKeeper, sk types.StakingKeeper) AppModule {
  return AppModule{
  AppModuleBasic: AppModuleBasic{cdc: cdc},
  keeper: keeper,

diff --git a/x/slashing/simulation/operations.go b/x/slashing/simulation/operations.go
@@ -24,7 +24,7 @@ const (
 // WeightedOperations returns all the operations from the module with their respective weights
 func WeightedOperations(
  appParams simtypes.AppParams, cdc codec.JSONCodec, ak types.AccountKeeper,
- bk types.BankKeeper, k keeper.Keeper, sk stakingkeeper.Keeper,
+ bk types.BankKeeper, k keeper.Keeper, sk types.StakingKeeper,
 ) simulation.WeightedOperations {
 
  var weightMsgUnjail int
@@ -37,7 +37,7 @@ func WeightedOperations(
  return simulation.WeightedOperations{
  simulation.NewWeightedOperation(
  weightMsgUnjail,
- SimulateMsgUnjail(ak, bk, k, sk),
+ SimulateMsgUnjail(ak, bk, k, sk.(stakingkeeper.Keeper)),
  ),
  }
 }