refactor(x/slashing): migrate AddrPubkeyRelation to collections

x/slashing/keeper/keeper.go

@@ -12,6 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/address"
 	"github.com/cosmos/cosmos-sdk/x/slashing/types"
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
@@ -76,14 +77,14 @@ func (k Keeper) AddPubkey(ctx context.Context, pubkey cryptotypes.PubKey) error
 		return err
 	}
 	store := k.storeService.OpenKVStore(ctx)
-	key := types.AddrPubkeyRelationKey(pubkey.Address())
+	key := append(types.AddrPubkeyRelationKeyPrefix, address.MustLengthPrefix(pubkey.Address())...)
 	return store.Set(key, bz)
 }
 
 // GetPubkey returns the pubkey from the adddress-pubkey relation
 func (k Keeper) GetPubkey(ctx context.Context, a cryptotypes.Address) (cryptotypes.PubKey, error) {
 	store := k.storeService.OpenKVStore(ctx)
-	bz, err := store.Get(types.AddrPubkeyRelationKey(a))
+	bz, err := store.Get(append(types.AddrPubkeyRelationKeyPrefix, address.MustLengthPrefix(a)...))
 	if err != nil {
 		return nil, err
 	}
@@ -148,5 +149,5 @@ func (k Keeper) Jail(ctx context.Context, consAddr sdk.ConsAddress) error {
 
 func (k Keeper) deleteAddrPubkeyRelation(ctx context.Context, addr cryptotypes.Address) error {
 	store := k.storeService.OpenKVStore(ctx)
-	return store.Delete(types.AddrPubkeyRelationKey(addr))
+	return store.Delete(append(types.AddrPubkeyRelationKeyPrefix, address.MustLengthPrefix(addr)...))
 }

x/slashing/migrations/v2/store_test.go

@@ -12,6 +12,7 @@ import (
 	"github.com/cosmos/cosmos-sdk/testutil"
 	"github.com/cosmos/cosmos-sdk/testutil/testdata"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/address"
 	v1 "github.com/cosmos/cosmos-sdk/x/slashing/migrations/v1"
 	v2 "github.com/cosmos/cosmos-sdk/x/slashing/migrations/v2"
 	"github.com/cosmos/cosmos-sdk/x/slashing/types"
@@ -46,7 +47,7 @@ func TestStoreMigration(t *testing.T) {
 		{
 			"AddrPubkeyRelationKey",
 			v1.AddrPubkeyRelationKey(consAddr),
-			types.AddrPubkeyRelationKey(consAddr),
+			append(types.AddrPubkeyRelationKeyPrefix, address.MustLengthPrefix(consAddr)...),
 		},
 	}
 

x/slashing/simulation/decoder_test.go

@@ -9,6 +9,7 @@ import (
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/address"
 	"github.com/cosmos/cosmos-sdk/types/kv"
 	moduletestutil "github.com/cosmos/cosmos-sdk/types/module/testutil"
 	"github.com/cosmos/cosmos-sdk/x/slashing"
@@ -36,7 +37,7 @@ func TestDecodeStore(t *testing.T) {
 		Pairs: []kv.Pair{
 			{Key: types.ValidatorSigningInfoKey(consAddr1), Value: cdc.MustMarshal(&info)},
 			{Key: types.ValidatorMissedBlockBitmapKey(consAddr1, 6), Value: missed},
-			{Key: types.AddrPubkeyRelationKey(delAddr1), Value: bz},
+			{Key: append(types.AddrPubkeyRelationKeyPrefix, address.MustLengthPrefix(delAddr1)...), Value: bz},
 			{Key: []byte{0x99}, Value: []byte{0x99}}, // This test should panic
 		},
 	}

x/slashing/types/keys.go

@@ -52,7 +52,7 @@ var (
 	ParamsKey                           = collections.NewPrefix(0) // Prefix for params key
 	ValidatorSigningInfoKeyPrefix       = collections.NewPrefix(1) // Prefix for signing info
 	ValidatorMissedBlockBitmapKeyPrefix = []byte{0x02}             // Prefix for missed block bitmap
-	AddrPubkeyRelationKeyPrefix         = []byte{0x03}             // Prefix for address-pubkey relation
+	AddrPubkeyRelationKeyPrefix         = collections.NewPrefix(3) // Prefix for address-pubkey relation
 )
 
 // ValidatorSigningInfoKey - stored by *Consensus* address (not operator address)
@@ -74,8 +74,3 @@ func ValidatorMissedBlockBitmapKey(v sdk.ConsAddress, chunkIndex int64) []byte {
 
 	return append(ValidatorMissedBlockBitmapPrefixKey(v), bz...)
 }
-
-// AddrPubkeyRelationKey gets pubkey relation key used to get the pubkey from the address
-func AddrPubkeyRelationKey(addr []byte) []byte {
-	return append(AddrPubkeyRelationKeyPrefix, address.MustLengthPrefix(addr)...)
-}