From 60fdb0a1a61d0646d3c3c1eb6a3dd2f18ecfa2f5 Mon Sep 17 00:00:00 2001 From: Marko Date: Wed, 12 Feb 2020 17:34:09 +0100 Subject: [PATCH] Merge PR #5619: proto: migrate params to hybrid codec --- app.go | 2 +- codec.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app.go b/app.go index dff6ab5b9f18..20215e8486f9 100644 --- a/app.go +++ b/app.go @@ -150,7 +150,7 @@ func NewSimApp( } // init params keeper and subspaces - app.ParamsKeeper = params.NewKeeper(app.cdc, keys[params.StoreKey], tkeys[params.TStoreKey]) + app.ParamsKeeper = params.NewKeeper(appCodec.Params, keys[params.StoreKey], tkeys[params.TStoreKey]) app.subspaces[auth.ModuleName] = app.ParamsKeeper.Subspace(auth.DefaultParamspace) app.subspaces[bank.ModuleName] = app.ParamsKeeper.Subspace(bank.DefaultParamspace) app.subspaces[staking.ModuleName] = app.ParamsKeeper.Subspace(staking.DefaultParamspace) diff --git a/codec.go b/codec.go index 96b2d6a70a15..0e8aabe15cb2 100644 --- a/codec.go +++ b/codec.go @@ -5,6 +5,7 @@ import ( sdk "github.com/cosmos/cosmos-sdk/types" "github.com/cosmos/cosmos-sdk/x/auth/vesting" distr "github.com/cosmos/cosmos-sdk/x/distribution" + "github.com/cosmos/cosmos-sdk/x/params" "github.com/cosmos/cosmos-sdk/x/staking" ) @@ -13,6 +14,7 @@ import ( type AppCodec struct { amino *codec.Codec + Params *params.Codec Staking *staking.Codec Distribution *distr.Codec } @@ -22,6 +24,7 @@ func NewAppCodec() *AppCodec { return &AppCodec{ amino: amino, + Params: params.NewCodec(amino), Staking: staking.NewCodec(amino), Distribution: distr.NewCodec(amino), }