check for empty exported keepers instead of empty sdk-defined keeper …

…structs
cosmos · Apr 23, 2022 · 91bd0ab · 91bd0ab
1 parent 43d4559
commit 91bd0ab
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/modules/core/keeper/keeper.go b/modules/core/keeper/keeper.go
@@ -9,8 +9,6 @@ import (
 	capabilitykeeper "github.com/cosmos/cosmos-sdk/x/capability/keeper"
 	paramtypes "github.com/cosmos/cosmos-sdk/x/params/types"
 
-	stakingkeeper "github.com/cosmos/cosmos-sdk/x/staking/keeper"
-	upgradekeeper "github.com/cosmos/cosmos-sdk/x/upgrade/keeper"
 	clientkeeper "github.com/cosmos/ibc-go/v3/modules/core/02-client/keeper"
 	clienttypes "github.com/cosmos/ibc-go/v3/modules/core/02-client/types"
 	connectionkeeper "github.com/cosmos/ibc-go/v3/modules/core/03-connection/keeper"
@@ -89,10 +87,10 @@ func (k *Keeper) SetRouter(rtr *porttypes.Router) {
 
 func checkEmptyKeepers(stakingKeeper clienttypes.StakingKeeper, upgradeKeeper clienttypes.UpgradeKeeper,
 	scopedKeeper capabilitykeeper.ScopedKeeper) error {
-	if reflect.DeepEqual(stakingkeeper.Keeper{}, stakingKeeper.(stakingkeeper.Keeper)) {
+	if reflect.ValueOf(stakingKeeper).IsZero() {
 		return fmt.Errorf("empty staking keeper")
 	}
-	if reflect.DeepEqual(upgradekeeper.Keeper{}, upgradeKeeper.(upgradekeeper.Keeper)) {
+	if reflect.ValueOf(upgradeKeeper).IsZero() {
 		return fmt.Errorf("empty upgradeKeeper")
 	}
 	if reflect.DeepEqual(capabilitykeeper.ScopedKeeper{}, scopedKeeper) {