fix tests

x/bank/migrations/v044/keys.go

@@ -4,10 +4,13 @@ var (
 	DenomAddressPrefix = []byte{0x03}
 )
 
-func CreateAddressDenomPrefix(denom string) []byte {
+// CreateDenomAddressPrefix creates a prefix for a reverse index of denomination
+// to account balance for that denomination.
+func CreateDenomAddressPrefix(denom string) []byte {
+	// we add a "zero" byte at the end - null byte terminator, to allow prefix denom prefix
+	// scan. Setting it is not needed (key[last] = 0) - because this is the default.
 	key := make([]byte, len(DenomAddressPrefix)+len(denom)+1)
 	copy(key, DenomAddressPrefix)
 	copy(key[len(DenomAddressPrefix):], denom)
-	// key[last] = 0 - not needed, because this is the default
 	return key
 }

x/bank/migrations/v044/store.go

@@ -59,7 +59,7 @@ func addDenomReverseIndex(store sdk.KVStore, cdc codec.BinaryCodec) error {
 
 		denomPrefixStore, ok := denomPrefixStores[balance.Denom]
 		if !ok {
-			denomPrefixStore = prefix.NewStore(store, CreateAddressDenomPrefix(balance.Denom))
+			denomPrefixStore = prefix.NewStore(store, CreateDenomAddressPrefix(balance.Denom))
 			denomPrefixStores[balance.Denom] = denomPrefixStore
 		}
 
@@ -82,9 +82,9 @@ func migrateDenomMetadata(store sdk.KVStore) error {
 		l := len(oldKey)/2 + 1
 
 		var newKey = make([]byte, len(types.DenomMetadataPrefix)+l)
-		copy(newKey, types.DenomMetadataPrefix)
 		// old key: prefix_bytes | denom_bytes | denom_bytes
-		newKey = append(newKey, oldKey[:l]...)
+		copy(newKey, types.DenomMetadataPrefix)
+		copy(newKey[len(types.DenomMetadataPrefix):], oldKey[:l])
 		store.Set(newKey, oldDenomMetaDataIter.Value())
 		oldDenomMetaDataStore.Delete(oldKey)
 	}

x/bank/migrations/v044/store_test.go

@@ -47,7 +47,7 @@ func TestMigrateStore(t *testing.T) {
 	}
 
 	for _, b := range balances {
-		denomPrefixStore := prefix.NewStore(store, v044.CreateAddressDenomPrefix(b.Denom))
+		denomPrefixStore := prefix.NewStore(store, v044.CreateDenomAddressPrefix(b.Denom))
 		bz := denomPrefixStore.Get(address.MustLengthPrefix(addr))
 		require.NotNil(t, bz)
 	}
@@ -88,6 +88,7 @@ func TestMigrateDenomMetaData(t *testing.T) {
 
 	for i := range []int{0, 1} {
 		key := append(v043.DenomMetadataPrefix, []byte(metaData[i].Base)...)
+		// keys before 0.44 had denom two times in the key
 		key = append(key, []byte(metaData[i].Base)...)
 		bz, err := encCfg.Codec.Marshal(&metaData[i])
 		require.NoError(t, err)
@@ -108,7 +109,7 @@ func TestMigrateDenomMetaData(t *testing.T) {
 		bz := denomMetadataStore.Get(oldKey)
 		require.Nil(t, bz)
 
-		require.Equal(t, string(newKey)[1:], metaData[i].Base)
+		require.Equal(t, string(newKey)[1:], metaData[i].Base, "idx: %d", i)
 		bz = denomMetadataStore.Get(denomMetadataIter.Key())
 		require.NotNil(t, bz)
 		err := encCfg.Codec.Unmarshal(bz, &result)