diff --git a/x/params/keeper_test.go b/x/params/keeper_test.go index a733a97d94..29c05d111e 100644 --- a/x/params/keeper_test.go +++ b/x/params/keeper_test.go @@ -28,8 +28,8 @@ func defaultContext(key sdk.StoreKey, tkey sdk.StoreKey) sdk.Context { type s struct{} func createTestCodec() *codec.Codec { - cdc := codec.NewCodec() - sdk.RegisterWire(cdc) + cdc := codec.New() + sdk.RegisterCodec(cdc) cdc.RegisterConcrete(s{}, "test/s", nil) return cdc } @@ -51,7 +51,7 @@ func TestKeeper(t *testing.T) { skey := sdk.NewKVStoreKey("test") tkey := sdk.NewTransientStoreKey("transient_test") ctx := defaultContext(skey, tkey) - space := NewKeeper(codec.NewCodec(), skey, tkey).Subspace("test") + space := NewKeeper(codec.New(), skey, tkey).Subspace("test") for _, kv := range kvs { require.NotPanics(t, func() { space.Set(ctx, kv.key, kv.param) }) diff --git a/x/slashing/genesis.go b/x/slashing/genesis.go index e5a58ba0a0..2af5e41045 100644 --- a/x/slashing/genesis.go +++ b/x/slashing/genesis.go @@ -21,8 +21,8 @@ func DefaultGenesisState() GenesisState { // and the keeper's address to pubkey map func InitGenesis(ctx sdk.Context, keeper Keeper, data GenesisState, sdata types.GenesisState) { for _, validator := range sdata.Validators { - keeper.addPubkey(ctx, validator.KeyGetPub()) + keeper.addPubkey(ctx, validator.GetPubKey()) } - keeper.paramstore.SetFromParamStruct(data.Params) + keeper.paramstore.SetFromParamStruct(ctx, &data.Params) } diff --git a/x/slashing/params.go b/x/slashing/params.go index 2cd3347340..f2a8a53d49 100644 --- a/x/slashing/params.go +++ b/x/slashing/params.go @@ -4,6 +4,7 @@ import ( "time" sdk "github.com/cosmos/cosmos-sdk/types" + "github.com/cosmos/cosmos-sdk/x/params" ) // Default parameter namespace @@ -33,6 +34,18 @@ type Params struct { SlashFractionDowntime sdk.Dec `json:"slash-fraction-downtime"` } +func (p *Params) KeyFieldPairs() params.KeyFieldPairs { + return params.KeyFieldPairs{ + {KeyMaxEvidenceAge, &p.MaxEvidenceAge}, + {KeySignedBlocksWindow, &p.SignedBlocksWindow}, + {KeyMinSignedPerWindow, &p.MinSignedPerWindow}, + {KeyDoubleSignUnbondDuration, &p.DoubleSignUnbondDuration}, + {KeyDowntimeUnbondDuration, &p.DowntimeUnbondDuration}, + {KeySlashFractionDoubleSign, &p.SlashFractionDoubleSign}, + {KeySlashFractionDowntime, &p.SlashFractionDowntime}, + } +} + // Default parameters used by Cosmos Hub func DefaultParams() Params { return Params{