reverts name to ComputeNextValidators because the semantics of Comput…

…eNextEpochConsumerValSet were different in v4.1
cosmos · May 2, 2024 · f2482b6 · f2482b6
1 parent 2109b42
commit f2482b6
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/x/ccv/provider/keeper/keeper.go b/x/ccv/provider/keeper/keeper.go
@@ -1279,7 +1279,7 @@ func (k Keeper) HasToValidate(
 	// if the validator is opted in and belongs to the validators of the next epoch, then if nothing changes
 	// the validator would have to validate in the next epoch
 	if k.IsOptedIn(ctx, chainID, provAddr) {
-		nextValidators := k.ComputeNextEpochConsumerValSet(ctx, chainID, k.stakingKeeper.GetLastValidators(ctx))
+		nextValidators := k.ComputeNextValidators(ctx, chainID, k.stakingKeeper.GetLastValidators(ctx))
 		for _, v := range nextValidators {
 			consAddr := sdk.ConsAddress(v.ProviderConsAddr)
 			if provAddr.ToSdkConsAddr().Equals(consAddr) {

diff --git a/x/ccv/provider/keeper/partial_set_security.go b/x/ccv/provider/keeper/partial_set_security.go
@@ -283,8 +283,8 @@ func (k Keeper) FilterOptedInAndAllowAndDenylistedPredicate(ctx sdk.Context, cha
 			!k.IsDenylisted(ctx, chainID, providerAddr))
 }
 
-// ComputeNextEpochConsumerValSet computes the validators for the upcoming epoch based on the currently `bondedValidators`
-func (k Keeper) ComputeNextEpochConsumerValSet(ctx sdk.Context, chainID string, bondedValidators []stakingtypes.Validator) []types.ConsumerValidator {
+// ComputeNextValidators computes the validators for the upcoming epoch based on the currently `bondedValidators`.
+func (k Keeper) ComputeNextValidators(ctx sdk.Context, chainID string, bondedValidators []stakingtypes.Validator) []types.ConsumerValidator {
 	nextValidators := k.FilterValidators(ctx, chainID, bondedValidators,
 		func(providerAddr types.ProviderConsAddress) bool {
 			return k.FilterOptedInAndAllowAndDenylistedPredicate(ctx, chainID, providerAddr)

diff --git a/x/ccv/provider/keeper/proposal.go b/x/ccv/provider/keeper/proposal.go
@@ -292,7 +292,7 @@ func (k Keeper) MakeConsumerGenesis(
 		}
 	}
 
-	nextValidators := k.ComputeNextEpochConsumerValSet(ctx, chainID, bondedValidators)
+	nextValidators := k.ComputeNextValidators(ctx, chainID, bondedValidators)
 
 	k.SetConsumerValSet(ctx, chainID, nextValidators)
 

diff --git a/x/ccv/provider/keeper/relay.go b/x/ccv/provider/keeper/relay.go
@@ -231,7 +231,7 @@ func (k Keeper) QueueVSCPackets(ctx sdk.Context) {
 			}
 		}
 
-		nextValidators := k.ComputeNextEpochConsumerValSet(ctx, chain.ChainId, bondedValidators)
+		nextValidators := k.ComputeNextValidators(ctx, chain.ChainId, bondedValidators)
 
 		valUpdates := DiffValidators(currentValidators, nextValidators)
 		k.SetConsumerValSet(ctx, chain.ChainId, nextValidators)
-Original file line number
+Diff line change
@@ Expand Up / @@ -292,7 +292,7 @@ func (k Keeper) MakeConsumerGenesis( @@
     		}
     	}
-    	nextValidators := k.ComputeNextEpochConsumerValSet(ctx, chainID, bondedValidators)
+    	nextValidators := k.ComputeNextValidators(ctx, chainID, bondedValidators)
     	k.SetConsumerValSet(ctx, chainID, nextValidators)
@@ Expand Down @@