rebased to pick up the inactive-validators work (PR #2079)

cosmos · Aug 14, 2024 · 64ed6e7 · 64ed6e7
1 parent d6f890a
commit 64ed6e7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 5 deletions.
diff --git a/x/ccv/provider/keeper/legacy_proposal_test.go b/x/ccv/provider/keeper/legacy_proposal_test.go
@@ -182,6 +182,8 @@ func TestUpdateConsumer(t *testing.T) {
 		ValidatorSetCap:    expectedValidatorSetCap,
 		Allowlist:          []string{expectedAllowlistedValidator},
 		Denylist:           []string{expectedDenylistedValidator},
+		MinStake:           expectedMinStake,
+		AllowInactiveVals:  expectedAllowInactiveValidators,
 	}
 
 	providerKeeper.SetConsumerIdToPhase(ctx, consumerId, providerkeeper.Initialized)

diff --git a/x/ccv/provider/keeper/permissionless.go b/x/ccv/provider/keeper/permissionless.go
@@ -377,6 +377,9 @@ func (k Keeper) UpdateConsumer(ctx sdk.Context, consumerId string) error {
 		}
 	}
 
+	k.SetMinStake(ctx, consumerId, updateRecord.MinStake)
+	k.SetInactiveValidatorsAllowed(ctx, consumerId, updateRecord.AllowInactiveVals)
+
 	return nil
 }
 

diff --git a/x/ccv/provider/keeper/validator_set_update.go b/x/ccv/provider/keeper/validator_set_update.go
@@ -14,7 +14,7 @@ import (
 
 // GetConsumerChainConsensusValidatorsKey returns the store key for consumer validators of the consumer chain with `chainID`
 func (k Keeper) GetConsumerChainConsensusValidatorsKey(ctx sdk.Context, chainID string) []byte {
-	return types.ChainIdWithLenKey(types.ConsumerValidatorKeyPrefix(), chainID)
+	return types.ConsumerIdWithLenKey(types.ConsumerValidatorKeyPrefix(), chainID)
 }
 
 // SetConsumerValidator sets provided consumer `validator` on the consumer chain with `chainID`

diff --git a/x/ccv/provider/types/keys_test.go b/x/ccv/provider/types/keys_test.go
@@ -124,17 +124,19 @@ func TestPreserveBytePrefix(t *testing.T) {
 	i++
 	require.Equal(t, uint8(45), providertypes.ConsumerIdKey()[0])
 	i++
-	require.Equal(t, uint8(47), providertypes.ConsumerIdToRegistrationRecordKey("consumerId")[0])
+	require.Equal(t, uint8(46), providertypes.ConsumerIdToRegistrationRecordKey("consumerId")[0])
 	i++
-	require.Equal(t, uint8(48), providertypes.ConsumerIdToInitializationRecordKey("consumerId")[0])
+	require.Equal(t, uint8(47), providertypes.ConsumerIdToInitializationRecordKey("consumerId")[0])
+	i++
+	require.Equal(t, uint8(48), providertypes.ConsumerIdToUpdateRecordKey("consumerId")[0])
 	i++
 	require.Equal(t, uint8(49), providertypes.ConsumerIdToOwnerAddressKey("consumerId")[0])
 	i++
 	require.Equal(t, uint8(50), providertypes.ConsumerIdToPhaseKey("consumerId")[0])
 	i++
-	require.Equal(t, uint8(52), providertypes.ConsumerIdToStopTimeKey("consumerId")[0])
+	require.Equal(t, uint8(51), providertypes.ConsumerIdToStopTimeKey("consumerId")[0])
 	i++
-	require.Equal(t, uint8(53), providertypes.ClientIdToConsumerIdKey("clientId")[0])
+	require.Equal(t, uint8(52), providertypes.ClientIdToConsumerIdKey("clientId")[0])
 	i++
 
 	prefixes := providertypes.GetAllKeyPrefixes()
-Original file line number
+Diff line change
@@ Expand Up @@
     		}
     	}
+    	k.SetMinStake(ctx, consumerId, updateRecord.MinStake)
+    	k.SetInactiveValidatorsAllowed(ctx, consumerId, updateRecord.AllowInactiveVals)
     	return nil
     }
@@ Expand Down @@