standardize keys prefix, remove append

Author: colmazia

x/feeds/types/keys.go

@@ -23,19 +23,21 @@ const (
 
 // Constants for keys
 var (
-	GlobalStoreKeyPrefix = []byte{0x00}
+	// global store keys
+	ReferenceSourceConfigStoreKey = []byte{0x00}
+	CurrentFeedsStoreKey          = []byte{0x01}
 
-	ReferenceSourceConfigStoreKey = append(GlobalStoreKeyPrefix, []byte("ReferenceSourceConfig")...)
-	CurrentFeedsStoreKey          = append(GlobalStoreKeyPrefix, []byte("CurrentFeeds")...)
+	// store prefixes
+	ValidatorPriceListStoreKeyPrefix = []byte{0x10}
+	PriceStoreKeyPrefix              = []byte{0x11}
+	DelegatorSignalsStoreKeyPrefix   = []byte{0x12}
+	SignalTotalPowerStoreKeyPrefix   = []byte{0x13}
 
-	ValidatorPriceListStoreKeyPrefix = []byte{0x01}
-	PriceStoreKeyPrefix              = []byte{0x02}
-	DelegatorSignalsStoreKeyPrefix   = []byte{0x03}
-	SignalTotalPowerStoreKeyPrefix   = []byte{0x04}
+	// index prefixes
+	SignalTotalPowerByPowerIndexKeyPrefix = []byte{0x80}
 
-	ParamsKey = []byte{0x10}
-
-	SignalTotalPowerByPowerIndexKeyPrefix = []byte{0x20}
+	// params store keys
+	ParamsKey = []byte{0x90}
 )
 
 // DelegatorSignalsStoreKey creates a key for storing delegator signals

x/feeds/types/keys_test.go

@@ -8,23 +8,63 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func TestValidatorPriceListStoreKey(t *testing.T) {
+	// Prefix: 0x10
+	expect, _ := hex.DecodeString("100a31303030303030303031")
+	require.Equal(t, expect, ValidatorPriceListStoreKey(sdk.ValAddress("1000000001")))
+
+	// Test with empty validator address
+	emptyVal := sdk.ValAddress{}
+	expectEmpty, _ := hex.DecodeString("10")
+	require.Equal(t, expectEmpty, ValidatorPriceListStoreKey(emptyVal))
+}
+
+func TestPriceStoreKey(t *testing.T) {
+	// Prefix: 0x11
+	expect, _ := hex.DecodeString("1142414e44")
+	require.Equal(t, expect, PriceStoreKey("BAND"))
+
+	// Test with empty string
+	expectEmpty, _ := hex.DecodeString("11")
+	require.Equal(t, expectEmpty, PriceStoreKey(""))
+}
+
 func TestDelegatorSignalsStoreKey(t *testing.T) {
+	// Prefix: 0x12
 	acc, _ := sdk.AccAddressFromHexUnsafe("b80f2a5df7d5710b15622d1a9f1e3830ded5bda8")
-	expect, _ := hex.DecodeString("0314b80f2a5df7d5710b15622d1a9f1e3830ded5bda8")
+	expect, _ := hex.DecodeString("1214b80f2a5df7d5710b15622d1a9f1e3830ded5bda8")
 	require.Equal(t, expect, DelegatorSignalsStoreKey(acc))
+
+	// Test with empty address
+	emptyAcc := sdk.AccAddress{}
+	expectEmpty, _ := hex.DecodeString("12")
+	require.Equal(t, expectEmpty, DelegatorSignalsStoreKey(emptyAcc))
 }
 
 func TestSignalTotalPowerStoreKey(t *testing.T) {
-	expect, _ := hex.DecodeString("0442414e44")
+	// Prefix: 0x13
+	expect, _ := hex.DecodeString("1342414e44")
 	require.Equal(t, expect, SignalTotalPowerStoreKey("BAND"))
-}
 
-func TestValidatorPriceListStoreKey(t *testing.T) {
-	expect, _ := hex.DecodeString("010a31303030303030303031")
-	require.Equal(t, expect, ValidatorPriceListStoreKey(sdk.ValAddress("1000000001")))
+	// Test with empty string
+	expectEmpty, _ := hex.DecodeString("13")
+	require.Equal(t, expectEmpty, SignalTotalPowerStoreKey(""))
 }
 
-func TestPriceStoreKey(t *testing.T) {
-	expect, _ := hex.DecodeString("0242414e44")
-	require.Equal(t, expect, PriceStoreKey("BAND"))
+func TestSignalTotalPowerByPowerIndexKey(t *testing.T) {
+	// Prefix: 0x80
+	// Test with signal ID "BAND" and power 100
+	expect, _ := hex.DecodeString(
+		"80000000000000006404bdbeb1bb",
+	) // Signal ID "BAND" with power 100, Signal ID bytes negated
+	require.Equal(t, expect, SignalTotalPowerByPowerIndexKey("BAND", 100))
+
+	// Test with empty signal ID and zero power
+	expectEmpty, _ := hex.DecodeString("80000000000000000000")
+	require.Equal(t, expectEmpty, SignalTotalPowerByPowerIndexKey("", 0))
+
+	// Test with empty signal ID and large power
+	largePower := int64(9223372036854775807) // Max int64
+	expectLargePower, _ := hex.DecodeString("807fffffffffffffff00")
+	require.Equal(t, expectLargePower, SignalTotalPowerByPowerIndexKey("", largePower))
 }