Refactor Staking Initialization

x/staking/keeper/keeper.go

@@ -37,7 +37,6 @@ func NewKeeper(
 	key storetypes.StoreKey,
 	ak types.AccountKeeper,
 	bk types.BankKeeper,
-	wk types.WormholeKeeper,
 	authority string,
 ) *Keeper {
 	// ensure bonded and not bonded module accounts are set
@@ -55,15 +54,21 @@ func NewKeeper(
 	}
 
 	return &Keeper{
-		storeKey:   key,
-		cdc:        cdc,
-		authKeeper: ak,
-		bankKeeper: bk,
-		hooks:      nil,
-		authority:  authority,
+		storeKey:       key,
+		cdc:            cdc,
+		authKeeper:     ak,
+		bankKeeper:     bk,
+		wormholeKeeper: nil,
+		hooks:          nil,
+		authority:      authority,
 	}
 }
 
+// / SetWormholekeeper sets the wormhole keeper
+func (k *Keeper) SetWormholekeeper(whk types.WormholeKeeper) {
+	k.wormholeKeeper = whk
+}
+
 func (k Keeper) IsConsensusGuardian(ctx sdk.Context, addr sdk.ValAddress) (bool, error) {
 	return k.wormholeKeeper.IsConsensusGuardian(ctx, addr)
 }

x/staking/keeper/keeper_test.go

@@ -56,7 +56,6 @@ func (s *KeeperTestSuite) SetupTest() {
 		key,
 		accountKeeper,
 		bankKeeper,
-		nil,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 	keeper.SetParams(ctx, stakingtypes.DefaultParams())

x/staking/module.go

@@ -237,9 +237,10 @@ func ProvideModule(in StakingInputs) StakingOutputs {
 		in.Key,
 		in.AccountKeeper,
 		in.BankKeeper,
-		in.WormholeKeeper,
 		authority.String(),
 	)
+	k.SetWormholekeeper(in.WormholeKeeper)
+
 	m := NewAppModule(in.Cdc, k, in.AccountKeeper, in.BankKeeper, in.WormholeKeeper, in.LegacySubspace)
 	return StakingOutputs{StakingKeeper: k, Module: m}
 }