chore: migrate from registry to delegation keeper

x/gov/keeper/keeper.go

@@ -24,7 +24,7 @@ type Keeper struct {
 	sk types.StakingKeeper
 
 	// The reference to the ProtocolDelegationSet and ProtocolValidatorSet to get information about protocol validators and delegators
-	rk types.RegistryKeeper
+	dk types.DelegationKeeper
 
 	// GovHooks
 	hooks types.GovHooks
@@ -48,7 +48,7 @@ type Keeper struct {
 // CONTRACT: the parameter Subspace must have the param key table already initialized
 func NewKeeper(
 	cdc codec.BinaryCodec, key sdk.StoreKey, paramSpace types.ParamSubspace,
-	authKeeper types.AccountKeeper, bankKeeper types.BankKeeper, sk types.StakingKeeper, rk types.RegistryKeeper, rtr types.Router,
+	authKeeper types.AccountKeeper, bankKeeper types.BankKeeper, sk types.StakingKeeper, dk types.DelegationKeeper, rtr types.Router,
 ) Keeper {
 	// ensure governance module account is set
 	if addr := authKeeper.GetModuleAddress(types.ModuleName); addr == nil {
@@ -66,7 +66,7 @@ func NewKeeper(
 		authKeeper: authKeeper,
 		bankKeeper: bankKeeper,
 		sk:         sk,
-		rk:         rk,
+		dk:         dk,
 		cdc:        cdc,
 		router:     rtr,
 	}

x/gov/keeper/tally.go

@@ -67,17 +67,15 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
 		})
 
 		//
-		if keeper.rk != nil {
-			keeper.rk.IterateProtocolBonding(ctx, voter, func(poolId uint64, amount sdk.Int) (stop bool) {
-				for _, option := range vote.Options {
-					subPower := amount.ToDec().Mul(option.Weight)
-					results[option.Option] = results[option.Option].Add(subPower)
-				}
+		if keeper.dk != nil {
+			amount := keeper.dk.GetBondingOfAddress(ctx, voter)
 
-				totalVotingPower = totalVotingPower.Add(amount.ToDec())
+			for _, option := range vote.Options {
+				subPower := amount.ToDec().Mul(option.Weight)
+				results[option.Option] = results[option.Option].Add(subPower)
+			}
 
-				return false
-			})
+			totalVotingPower = totalVotingPower.Add(amount.ToDec())
 		}
 
 		keeper.deleteVote(ctx, vote.ProposalId, voter)
@@ -104,8 +102,8 @@ func (keeper Keeper) Tally(ctx sdk.Context, proposal types.Proposal) (passes boo
 	tallyResults = types.NewTallyResultFromMap(results)
 
 	totalProtocolBonded := sdk.ZeroInt()
-	if keeper.rk != nil {
-		totalProtocolBonded = keeper.rk.TotalProtocolBonding(ctx)
+	if keeper.dk != nil {
+		totalProtocolBonded = keeper.dk.TotalProtocolBonding(ctx)
 	}
 	totalBonded := keeper.sk.TotalBondedTokens(ctx).Add(totalProtocolBonded)
 

x/gov/types/expected_keepers.go

@@ -26,9 +26,9 @@ type StakingKeeper interface {
 	)
 }
 
-// RegistryKeeper expected registry keeper (Protocol Validator and Delegator sets) (noalias)
-type RegistryKeeper interface {
-	IterateProtocolBonding(ctx sdk.Context, address sdk.AccAddress, fn func(poolId uint64, amount sdk.Int) (stop bool))
+// DelegationKeeper expected delegation keeper (Protocol Validator and Delegator sets) (noalias)
+type DelegationKeeper interface {
+	GetBondingOfAddress(ctx sdk.Context, address sdk.AccAddress) sdk.Int
 	TotalProtocolBonding(ctx sdk.Context) sdk.Int
 }