From 2d63a9153af78bf8d38d2a3fbddd173e4c664f7a Mon Sep 17 00:00:00 2001 From: marbar3778 Date: Thu, 8 Jul 2021 09:19:18 +0200 Subject: [PATCH] revert changes --- baseapp/baseapp.go | 7 ------- baseapp/params.go | 12 ------------ x/params/keeper/migrations.go | 23 ----------------------- x/params/legacy/v044/store.go | 26 -------------------------- x/params/module.go | 3 --- 5 files changed, 71 deletions(-) delete mode 100644 x/params/keeper/migrations.go delete mode 100644 x/params/legacy/v044/store.go diff --git a/baseapp/baseapp.go b/baseapp/baseapp.go index a994f914a0fa..ebf90301dfe5 100644 --- a/baseapp/baseapp.go +++ b/baseapp/baseapp.go @@ -427,13 +427,6 @@ func (app *BaseApp) GetConsensusParams(ctx sdk.Context) *abci.ConsensusParams { cp.Validator = &vp } - if app.paramStore.Has(ctx, ParamStoreKeyVersionParams) { - var vp tmproto.VersionParams - - app.paramStore.Get(ctx, ParamStoreKeyVersionParams, &vp) - cp.Version = &vp - } - return cp } diff --git a/baseapp/params.go b/baseapp/params.go index dbfb44fb6aae..14701d524798 100644 --- a/baseapp/params.go +++ b/baseapp/params.go @@ -18,7 +18,6 @@ var ( ParamStoreKeyBlockParams = []byte("BlockParams") ParamStoreKeyEvidenceParams = []byte("EvidenceParams") ParamStoreKeyValidatorParams = []byte("ValidatorParams") - ParamStoreKeyVersionParams = []byte("VersionParams") ) // ParamStore defines the interface the parameter store used by the BaseApp must @@ -85,14 +84,3 @@ func ValidateValidatorParams(i interface{}) error { return nil } - -// ValidateVersionParams defines a stateless validation on VersionParams. This -// function is called whenever the parameters are updated or stored. -func ValidateVersionParams(i interface{}) error { - _, ok := i.(tmproto.VersionParams) - if !ok { - return fmt.Errorf("invalid parameter type: %T", i) - } - - return nil -} diff --git a/x/params/keeper/migrations.go b/x/params/keeper/migrations.go deleted file mode 100644 index 2f068242bfa1..000000000000 --- a/x/params/keeper/migrations.go +++ /dev/null @@ -1,23 +0,0 @@ -package keeper - -import ( - "github.com/cosmos/cosmos-sdk/baseapp" - sdk "github.com/cosmos/cosmos-sdk/types" - v044 "github.com/cosmos/cosmos-sdk/x/params/legacy/v044" -) - -// Migrator is a struct for handling in-place store migrations. -type Migrator struct { - keeper Keeper -} - -// NewMigrator returns a new Migrator. -func NewMigrator(keeper Keeper) Migrator { - return Migrator{keeper: keeper} -} - -// Migrate1to2 migrates from version 1 to 2. -func (m Migrator) Migrate1to2(ctx sdk.Context) error { - subspace, _ := m.keeper.GetSubspace(baseapp.Paramspace) - return v044.MigrateStore(ctx, m.keeper.key, subspace) -} diff --git a/x/params/legacy/v044/store.go b/x/params/legacy/v044/store.go deleted file mode 100644 index 4e935e3f8904..000000000000 --- a/x/params/legacy/v044/store.go +++ /dev/null @@ -1,26 +0,0 @@ -package v044 - -import ( - tmproto "github.com/tendermint/tendermint/proto/tendermint/types" - - "github.com/cosmos/cosmos-sdk/baseapp" - sdk "github.com/cosmos/cosmos-sdk/types" - paramtypes "github.com/cosmos/cosmos-sdk/x/params/types" -) - -// migrateParamsStore adds application version parameters to baseapp parameters -func migrateParamsStore(ctx sdk.Context, paramstore paramtypes.Subspace) { - if paramstore.HasKeyTable() { - paramstore.Set(ctx, baseapp.ParamStoreKeyVersionParams, tmproto.VersionParams{}) - } else { - paramstore.WithKeyTable(paramtypes.ConsensusParamsKeyTable()) - paramstore.Set(ctx, baseapp.ParamStoreKeyVersionParams, tmproto.VersionParams{}) - } -} - -// MigrateStore adds a new key, versionParams, for baseapp consensus parameters. -func MigrateStore(ctx sdk.Context, storeKey sdk.StoreKey, paramstore paramtypes.Subspace) error { - migrateParamsStore(ctx, paramstore) - return nil - -} diff --git a/x/params/module.go b/x/params/module.go index 4f2067397e34..3f14475cd087 100644 --- a/x/params/module.go +++ b/x/params/module.go @@ -113,9 +113,6 @@ func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc *codec.LegacyAmino) sd func (am AppModule) RegisterServices(cfg module.Configurator) { proposal.RegisterQueryServer(cfg.QueryServer(), am.keeper) - m := keeper.NewMigrator(am.keeper) - cfg.RegisterMigration(types.ModuleName, 2, m.Migrate1to2) - } // ProposalContents returns all the params content functions used to