Added migration methods for deposit store

x/deposit/keeper/deposit.go

@@ -10,7 +10,7 @@ import (
 // SetDeposit is for inserting a deposit into KVStore.
 func (k *Keeper) SetDeposit(ctx sdk.Context, deposit types.Deposit) {
 	key := types.DepositKey(deposit.GetAddress())
-	value := k.cdc.MustMarshalBinaryBare(&deposit)
+	value := k.cdc.MustMarshal(&deposit)
 
 	store := k.Store(ctx)
 	store.Set(key, value)
@@ -26,7 +26,7 @@ func (k *Keeper) GetDeposit(ctx sdk.Context, address sdk.AccAddress) (deposit ty
 		return deposit, false
 	}
 
-	k.cdc.MustUnmarshalBinaryBare(value, &deposit)
+	k.cdc.MustUnmarshal(value, &deposit)
 	return deposit, true
 }
 
@@ -44,7 +44,7 @@ func (k *Keeper) GetDeposits(ctx sdk.Context, skip, limit int64) (items types.De
 	iter.Skip(skip)
 	iter.Limit(limit, func(iter sdk.Iterator) {
 		var item types.Deposit
-		k.cdc.MustUnmarshalBinaryBare(iter.Value(), &item)
+		k.cdc.MustUnmarshal(iter.Value(), &item)
 		items = append(items, item)
 	})
 
@@ -137,7 +137,7 @@ func (k *Keeper) IterateDeposits(ctx sdk.Context, fn func(index int, item types.
 
 	for i := 0; iterator.Valid(); iterator.Next() {
 		var deposit types.Deposit
-		k.cdc.MustUnmarshalBinaryBare(iterator.Value(), &deposit)
+		k.cdc.MustUnmarshal(iterator.Value(), &deposit)
 
 		if stop := fn(i, deposit); stop {
 			break

x/deposit/keeper/keeper.go

@@ -14,11 +14,11 @@ import (
 
 type Keeper struct {
 	key  sdk.StoreKey
-	cdc  codec.BinaryMarshaler
+	cdc  codec.BinaryCodec
 	bank expected.BankKeeper
 }
 
-func NewKeeper(cdc codec.BinaryMarshaler, key sdk.StoreKey) Keeper {
+func NewKeeper(cdc codec.BinaryCodec, key sdk.StoreKey) Keeper {
 	return Keeper{
 		key: key,
 		cdc: cdc,

x/deposit/keeper/migrations.go

@@ -0,0 +1,37 @@
+package keeper
+
+import (
+	"github.com/cosmos/cosmos-sdk/store/prefix"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+
+	"github.com/sentinel-official/hub/x/deposit/types"
+)
+
+type Migrator struct {
+	k Keeper
+}
+
+func NewMigrator(k Keeper) Migrator {
+	return Migrator{k: k}
+}
+
+func (m Migrator) Migrate1to2(ctx sdk.Context) error {
+	store := m.k.Store(ctx)
+	return migrateDepositKeys(store)
+}
+
+func migrateDepositKeys(parent sdk.KVStore) error {
+	child := prefix.NewStore(parent, types.DepositKeyPrefix)
+
+	iterator := child.Iterator(nil, nil)
+	defer iterator.Close()
+
+	for ; iterator.Valid(); iterator.Next() {
+		key := types.DepositKey(iterator.Key())
+
+		parent.Set(key, iterator.Value())
+		child.Delete(iterator.Key())
+	}
+
+	return nil
+}

x/deposit/keeper/query_server.go

@@ -57,7 +57,7 @@ func (q *queryServer) QueryDeposits(c context.Context, req *types.QueryDepositsR
 
 	pagination, err := query.FilteredPaginate(store, req.Pagination, func(_, value []byte, accumulate bool) (bool, error) {
 		var item types.Deposit
-		if err := q.cdc.UnmarshalBinaryBare(value, &item); err != nil {
+		if err := q.cdc.Unmarshal(value, &item); err != nil {
 			return false, err
 		}
 

x/deposit/simulation/decoder.go

@@ -10,12 +10,12 @@ import (
 	"github.com/sentinel-official/hub/x/deposit/types"
 )
 
-func NewStoreDecoder(cdc codec.Marshaler) func(kvA, kvB kv.Pair) string {
+func NewStoreDecoder(cdc codec.Codec) func(kvA, kvB kv.Pair) string {
 	return func(kvA, kvB kv.Pair) string {
 		if bytes.Equal(kvA.Key[:1], types.DepositKeyPrefix) {
 			var depositA, depositB types.Deposit
-			cdc.MustUnmarshalBinaryBare(kvA.Value, &depositA)
-			cdc.MustUnmarshalBinaryBare(kvB.Value, &depositB)
+			cdc.MustUnmarshal(kvA.Value, &depositA)
+			cdc.MustUnmarshal(kvB.Value, &depositB)
 
 			return fmt.Sprintf("%v\n%v", depositA, depositB)
 		}

x/deposit/types/keys.go

@@ -1,9 +1,8 @@
 package types
 
 import (
-	"fmt"
-
 	sdk "github.com/cosmos/cosmos-sdk/types"
+	"github.com/cosmos/cosmos-sdk/types/address"
 )
 
 const (
@@ -20,11 +19,6 @@ var (
 	DepositKeyPrefix = []byte{0x10}
 )
 
-func DepositKey(address sdk.AccAddress) []byte {
-	v := append(DepositKeyPrefix, address.Bytes()...)
-	if len(v) != 1+sdk.AddrLen {
-		panic(fmt.Errorf("invalid key length %d; expected %d", len(v), 1+sdk.AddrLen))
-	}
-
-	return v
+func DepositKey(addr sdk.AccAddress) []byte {
+	return append(DepositKeyPrefix, address.MustLengthPrefix(addr.Bytes())...)
 }