diff --git a/x/machine/keeper/migrations.go b/x/machine/keeper/migrations.go index 668d453..cd45a3d 100644 --- a/x/machine/keeper/migrations.go +++ b/x/machine/keeper/migrations.go @@ -22,5 +22,5 @@ func (m Migrator) Migrate1to2(ctx sdk.Context) error { } func (m Migrator) Migrate2to3(ctx sdk.Context) error { - return v3.MigrateStore(ctx, m.keeper.taStoreKey, m.keeper.cdc) + return v3.MigrateStore(ctx, m.keeper.taStoreKey, m.keeper.storeKey) } diff --git a/x/machine/migrations/v3/migrate.go b/x/machine/migrations/v3/migrate.go index 7cb67d5..8cc6fbc 100644 --- a/x/machine/migrations/v3/migrate.go +++ b/x/machine/migrations/v3/migrate.go @@ -3,18 +3,17 @@ package v3 import ( "encoding/binary" - "github.com/cosmos/cosmos-sdk/codec" "github.com/cosmos/cosmos-sdk/store/prefix" storetypes "github.com/cosmos/cosmos-sdk/store/types" sdk "github.com/cosmos/cosmos-sdk/types" "github.com/planetmint/planetmint-go/x/machine/types" ) -func MigrateStore(ctx sdk.Context, storeKey storetypes.StoreKey, _ codec.BinaryCodec) error { - store := prefix.NewStore(ctx.KVStore(storeKey), types.KeyPrefix(types.TrustAnchorKey)) +func MigrateStore(ctx sdk.Context, taStoreKey storetypes.StoreKey, storeKey storetypes.StoreKey) error { + store := ctx.KVStore(taStoreKey) count := uint64(0) - iterator := store.Iterator(nil, nil) + iterator := sdk.KVStorePrefixIterator(store, []byte(types.TrustAnchorKey)) defer iterator.Close() for ; iterator.Valid(); iterator.Next() { if iterator.Value()[0] == 1 { diff --git a/x/machine/module.go b/x/machine/module.go index db9a783..1bc1b34 100644 --- a/x/machine/module.go +++ b/x/machine/module.go @@ -149,7 +149,7 @@ func (am AppModule) ExportGenesis(ctx sdk.Context, cdc codec.JSONCodec) json.Raw } // ConsensusVersion is a sequence number for state-breaking change of the module. It should be incremented on each consensus-breaking change introduced by the module. To avoid wrong/empty versions, the initial version should be set to 1 -func (AppModule) ConsensusVersion() uint64 { return 2 } +func (AppModule) ConsensusVersion() uint64 { return 4 } // BeginBlock contains the logic that is automatically triggered at the beginning of each block func (am AppModule) BeginBlock(_ sdk.Context, _ abci.RequestBeginBlock) {