convert keys prefixes to byte

cosmos · Jul 25, 2024 · 67eb577 · 67eb577
1 parent 2a3f4a6
commit 67eb577
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 42 deletions.
diff --git a/x/ccv/provider/migrations/v8/migrations.go b/x/ccv/provider/migrations/v8/migrations.go
@@ -12,13 +12,13 @@ import (
 )
 
 const (
-	LegacyUnbondingOpBytePrefix                = 11
-	LegacyConsumerAddrsToPruneBytePrefix       = 25
-	LegacyMaturedUnbondingOpsByteKey           = 1
-	LegacyUnbondingOpIndexBytePrefix           = 12
-	LegacyInitTimeoutTimestampBytePrefix       = 8
-	LegacyVscSendTimestampBytePrefix           = 18
-	LegacyVSCMaturedHandledThisBlockBytePrefix = 28
+	LegacyUnbondingOpBytePrefix                = byte(11)
+	LegacyConsumerAddrsToPruneBytePrefix       = byte(25)
+	LegacyMaturedUnbondingOpsByteKey           = byte(1)
+	LegacyUnbondingOpIndexBytePrefix           = byte(12)
+	LegacyInitTimeoutTimestampBytePrefix       = byte(8)
+	LegacyVscSendTimestampBytePrefix           = byte(18)
+	LegacyVSCMaturedHandledThisBlockBytePrefix = byte(28)
 )
 
 // CompleteUnbondingOps completes all unbonding operations.

diff --git a/x/ccv/provider/types/keys_test.go b/x/ccv/provider/types/keys_test.go
@@ -27,91 +27,91 @@ func TestNoDuplicates(t *testing.T) {
 // Test that the value of all byte prefixes is preserved
 func TestPreserveBytePrefix(t *testing.T) {
 	i := 0
-	require.Equal(t, uint8(0xFF), providertypes.ParametersKey()[0])
+	require.Equal(t, byte(0xFF), providertypes.ParametersKey()[0])
 	i++
-	require.Equal(t, uint8(0), providertypes.PortKey()[0])
+	require.Equal(t, byte(0), providertypes.PortKey()[0])
 	i++
 	// reserve 1 as deprecated
 	i++
-	require.Equal(t, uint8(2), providertypes.ValidatorSetUpdateIdKey()[0])
+	require.Equal(t, byte(2), providertypes.ValidatorSetUpdateIdKey()[0])
 	i++
-	require.Equal(t, uint8(3), providertypes.SlashMeterKey()[0])
+	require.Equal(t, byte(3), providertypes.SlashMeterKey()[0])
 	i++
-	require.Equal(t, uint8(4), providertypes.SlashMeterReplenishTimeCandidateKey()[0])
+	require.Equal(t, byte(4), providertypes.SlashMeterReplenishTimeCandidateKey()[0])
 	i++
-	require.Equal(t, uint8(5), providertypes.ChainToChannelKey("chainID")[0])
+	require.Equal(t, byte(5), providertypes.ChainToChannelKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(6), providertypes.ChannelToChainKeyPrefix()[0])
+	require.Equal(t, byte(6), providertypes.ChannelToChainKeyPrefix()[0])
 	i++
-	require.Equal(t, uint8(7), providertypes.ChainToClientKeyPrefix()[0])
+	require.Equal(t, byte(7), providertypes.ChainToClientKeyPrefix()[0])
 	i++
 	// reserve 8 as deprecated
 	i++
-	require.Equal(t, uint8(9), providertypes.PendingCAPKeyPrefix()[0])
+	require.Equal(t, byte(9), providertypes.PendingCAPKeyPrefix()[0])
 	i++
-	require.Equal(t, uint8(10), providertypes.PendingCRPKeyPrefix()[0])
+	require.Equal(t, byte(10), providertypes.PendingCRPKeyPrefix()[0])
 	i++
 	// reserve 11 as deprecated
 	i++
 	// reserve 12 as deprecated
 	i++
-	require.Equal(t, uint8(13), providertypes.ValsetUpdateBlockHeightKeyPrefix()[0])
+	require.Equal(t, byte(13), providertypes.ValsetUpdateBlockHeightKeyPrefix()[0])
 	i++
-	require.Equal(t, uint8(14), providertypes.ConsumerGenesisKey("chainID")[0])
+	require.Equal(t, byte(14), providertypes.ConsumerGenesisKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(15), providertypes.SlashAcksKey("chainID")[0])
+	require.Equal(t, byte(15), providertypes.SlashAcksKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(16), providertypes.InitChainHeightKey("chainID")[0])
+	require.Equal(t, byte(16), providertypes.InitChainHeightKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(17), providertypes.PendingVSCsKey("chainID")[0])
+	require.Equal(t, byte(17), providertypes.PendingVSCsKey("chainID")[0])
 	i++
 	// reserve 18 as deprecated
 	i++
-	require.Equal(t, uint8(19), providertypes.ThrottledPacketDataSizeKey("chainID")[0])
+	require.Equal(t, byte(19), providertypes.ThrottledPacketDataSizeKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(20), providertypes.ThrottledPacketDataKeyPrefix())
+	require.Equal(t, byte(20), providertypes.ThrottledPacketDataKeyPrefix())
 	i++
-	require.Equal(t, uint8(21), providertypes.GlobalSlashEntryKeyPrefix()[0])
+	require.Equal(t, byte(21), providertypes.GlobalSlashEntryKeyPrefix()[0])
 	i++
-	require.Equal(t, uint8(22), providertypes.ConsumerValidatorsKeyPrefix())
+	require.Equal(t, byte(22), providertypes.ConsumerValidatorsKeyPrefix())
 	i++
-	require.Equal(t, uint8(23), providertypes.ValidatorsByConsumerAddrKeyPrefix())
+	require.Equal(t, byte(23), providertypes.ValidatorsByConsumerAddrKeyPrefix())
 	i++
 	// reserve 24 as deprecated
 	i++
 	// reserve 25 as deprecated
 	i++
-	require.Equal(t, uint8(26), providertypes.SlashLogKey(providertypes.NewProviderConsAddress([]byte{0x05}))[0])
+	require.Equal(t, byte(26), providertypes.SlashLogKey(providertypes.NewProviderConsAddress([]byte{0x05}))[0])
 	i++
-	require.Equal(t, uint8(27), providertypes.ConsumerRewardDenomsKeyPrefix()[0])
+	require.Equal(t, byte(27), providertypes.ConsumerRewardDenomsKeyPrefix()[0])
 	i++
 	// reserve 28 as deprecated
 	i++
-	require.Equal(t, uint8(29), providertypes.EquivocationEvidenceMinHeightKey("chainID")[0])
+	require.Equal(t, byte(29), providertypes.EquivocationEvidenceMinHeightKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(30), providertypes.ProposedConsumerChainKeyPrefix()[0])
+	require.Equal(t, byte(30), providertypes.ProposedConsumerChainKeyPrefix()[0])
 	i++
-	require.Equal(t, uint8(31), providertypes.ConsumerValidatorKeyPrefix())
+	require.Equal(t, byte(31), providertypes.ConsumerValidatorKeyPrefix())
 	i++
-	require.Equal(t, uint8(32), providertypes.OptedInKeyPrefix())
+	require.Equal(t, byte(32), providertypes.OptedInKeyPrefix())
 	i++
-	require.Equal(t, uint8(33), providertypes.TopNKey("chainID")[0])
+	require.Equal(t, byte(33), providertypes.TopNKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(34), providertypes.ValidatorsPowerCapKey("chainID")[0])
+	require.Equal(t, byte(34), providertypes.ValidatorsPowerCapKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(35), providertypes.ValidatorSetCapKey("chainID")[0])
+	require.Equal(t, byte(35), providertypes.ValidatorSetCapKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(36), providertypes.AllowlistKeyPrefix())
+	require.Equal(t, byte(36), providertypes.AllowlistKeyPrefix())
 	i++
-	require.Equal(t, uint8(37), providertypes.DenylistKeyPrefix())
+	require.Equal(t, byte(37), providertypes.DenylistKeyPrefix())
 	i++
-	require.Equal(t, uint8(38), providertypes.ConsumerRewardsAllocationKey("chainID")[0])
+	require.Equal(t, byte(38), providertypes.ConsumerRewardsAllocationKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(39), providertypes.ConsumerCommissionRateKeyPrefix())
+	require.Equal(t, byte(39), providertypes.ConsumerCommissionRateKeyPrefix())
 	i++
-	require.Equal(t, uint8(40), providertypes.MinimumPowerInTopNKey("chainID")[0])
+	require.Equal(t, byte(40), providertypes.MinimumPowerInTopNKey("chainID")[0])
 	i++
-	require.Equal(t, uint8(41), providertypes.ConsumerAddrsToPruneV2KeyPrefix())
+	require.Equal(t, byte(41), providertypes.ConsumerAddrsToPruneV2KeyPrefix())
 	i++
 	prefixes := providertypes.GetAllKeyPrefixes()
 	require.Equal(t, len(prefixes), i)