remove staking dep

x/protocolpool/depinject.go

@@ -37,7 +37,6 @@ type ModuleInputs struct {
 
 	AccountKeeper types.AccountKeeper
 	BankKeeper    types.BankKeeper
-	StakingKeeper types.StakingKeeper
 }
 
 type ModuleOutputs struct {
@@ -59,7 +58,7 @@ func ProvideModule(in ModuleInputs) ModuleOutputs {
 		panic(err)
 	}
 
-	k := keeper.NewKeeper(in.Codec, in.Environment, in.AccountKeeper, in.BankKeeper, in.StakingKeeper, authorityAddr)
+	k := keeper.NewKeeper(in.Codec, in.Environment, in.AccountKeeper, in.BankKeeper, authorityAddr)
 	m := NewAppModule(in.Codec, k, in.AccountKeeper, in.BankKeeper)
 
 	return ModuleOutputs{

x/protocolpool/keeper/keeper.go

@@ -21,9 +21,8 @@ import (
 type Keeper struct {
 	appmodule.Environment
 
-	authKeeper    types.AccountKeeper
-	bankKeeper    types.BankKeeper
-	stakingKeeper types.StakingKeeper
+	authKeeper types.AccountKeeper
+	bankKeeper types.BankKeeper
 
 	cdc codec.BinaryCodec
 
@@ -43,7 +42,7 @@ const (
 	errModuleAccountNotSet = "%s module account has not been set"
 )
 
-func NewKeeper(cdc codec.BinaryCodec, env appmodule.Environment, ak types.AccountKeeper, bk types.BankKeeper, sk types.StakingKeeper, authority string,
+func NewKeeper(cdc codec.BinaryCodec, env appmodule.Environment, ak types.AccountKeeper, bk types.BankKeeper, authority string,
 ) Keeper {
 	// ensure pool module account is set
 	if addr := ak.GetModuleAddress(types.ModuleName); addr == nil {
@@ -64,7 +63,6 @@ func NewKeeper(cdc codec.BinaryCodec, env appmodule.Environment, ak types.Accoun
 		Environment:               env,
 		authKeeper:                ak,
 		bankKeeper:                bk,
-		stakingKeeper:             sk,
 		cdc:                       cdc,
 		authority:                 authority,
 		BudgetProposal:            collections.NewMap(sb, types.BudgetKey, "budget", sdk.AccAddressKey, codec.CollValue[types.Budget](cdc)),

x/protocolpool/keeper/keeper_test.go

@@ -35,12 +35,11 @@ var (
 type KeeperTestSuite struct {
 	suite.Suite
 
-	ctx           sdk.Context
-	environment   appmodule.Environment
-	poolKeeper    poolkeeper.Keeper
-	authKeeper    *pooltestutil.MockAccountKeeper
-	bankKeeper    *pooltestutil.MockBankKeeper
-	stakingKeeper *pooltestutil.MockStakingKeeper
+	ctx         sdk.Context
+	environment appmodule.Environment
+	poolKeeper  poolkeeper.Keeper
+	authKeeper  *pooltestutil.MockAccountKeeper
+	bankKeeper  *pooltestutil.MockBankKeeper
 
 	msgServer   types.MsgServer
 	queryServer types.QueryServer
@@ -66,10 +65,6 @@ func (s *KeeperTestSuite) SetupTest() {
 	bankKeeper := pooltestutil.NewMockBankKeeper(ctrl)
 	s.bankKeeper = bankKeeper
 
-	stakingKeeper := pooltestutil.NewMockStakingKeeper(ctrl)
-	stakingKeeper.EXPECT().BondDenom(ctx).Return("stake", nil).AnyTimes()
-	s.stakingKeeper = stakingKeeper
-
 	authority, err := accountKeeper.AddressCodec().BytesToString(authtypes.NewModuleAddress(types.GovModuleName))
 	s.Require().NoError(err)
 
@@ -78,7 +73,6 @@ func (s *KeeperTestSuite) SetupTest() {
 		environment,
 		accountKeeper,
 		bankKeeper,
-		stakingKeeper,
 		authority,
 	)
 	s.ctx = ctx
@@ -101,7 +95,6 @@ func (s *KeeperTestSuite) mockWithdrawContinuousFund() {
 	distrBal := sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, math.NewInt(100000)))
 	s.bankKeeper.EXPECT().GetAllBalances(gomock.Any(), gomock.Any()).Return(distrBal).AnyTimes()
 	s.bankKeeper.EXPECT().SendCoinsFromModuleToAccount(gomock.Any(), gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes()
-	s.stakingKeeper.EXPECT().BondDenom(gomock.Any()).Return("stake", nil).AnyTimes()
 }
 
 func (s *KeeperTestSuite) mockStreamFunds(distributed math.Int) {

x/protocolpool/types/expected_keepers.go

@@ -23,7 +23,3 @@ type BankKeeper interface {
 	SendCoinsFromAccountToModule(ctx context.Context, senderAddr sdk.AccAddress, recipientModule string, amt sdk.Coins) error
 	SendCoinsFromModuleToModule(ctx context.Context, senderModule, recipientModule string, amt sdk.Coins) error
 }
-
-type StakingKeeper interface {
-	BondDenom(ctx context.Context) (string, error)
-}