removed acck keeper dependency in custom staking module

ComposableFi · Dec 22, 2023 · 4c3e769 · 4c3e769
1 parent 9e57dae
commit 4c3e769
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -196,7 +196,7 @@ func (appKeepers *AppKeepers) InitNormalKeepers(
 	appKeepers.StakingMiddlewareKeeper = stakingmiddleware.NewKeeper(appCodec, appKeepers.keys[stakingmiddlewaretypes.StoreKey], authtypes.NewModuleAddress(govtypes.ModuleName).String())
 
 	appKeepers.CustomStakingKeeper = customstaking.NewKeeper(
-		appCodec /*appKeepers.keys[stakingtypes.StoreKey],*/, *appKeepers.StakingKeeper, appKeepers.AccountKeeper, &appKeepers.StakingMiddlewareKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		appCodec, *appKeepers.StakingKeeper, &appKeepers.StakingMiddlewareKeeper, authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
 	appKeepers.DistrKeeper = distrkeeper.NewKeeper(

diff --git a/custom/staking/keeper/keeper.go b/custom/staking/keeper/keeper.go
@@ -3,7 +3,6 @@ package keeper
 import (
 	abcicometbft "github.com/cometbft/cometbft/abci/types"
 	"github.com/cosmos/cosmos-sdk/codec"
-	accountkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
 	"github.com/cosmos/cosmos-sdk/x/staking/types"
 
@@ -14,7 +13,6 @@ import (
 type Keeper struct {
 	stakingkeeper.Keeper
 	cdc               codec.BinaryCodec
-	acck              accountkeeper.AccountKeeper
 	Stakingmiddleware *stakingmiddleware.Keeper
 	authority         string
 }
@@ -110,13 +108,11 @@ func (k Keeper) BlockValidatorUpdates(ctx sdk.Context, height int64) []abcicomet
 func NewKeeper(
 	cdc codec.BinaryCodec,
 	staking stakingkeeper.Keeper,
-	acck accountkeeper.AccountKeeper,
 	stakingmiddleware *stakingmiddleware.Keeper,
 	authority string,
 ) Keeper {
 	keeper := Keeper{
 		Keeper:            staking,
-		acck:              acck,
 		authority:         authority,
 		Stakingmiddleware: stakingmiddleware,
 		cdc:               cdc,