LaconicNetwork/cosmos-sdk
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove hybrid codec usage (#6843)

Browse Source 
* remove hybrid codec for slashing, staking and upgrade

* Remove hybridcodec from params and mint

* revert staking

* Fix gov

* Fix ibc and evidence

* Fix ibc-transfer

* Fix staking

* remove evidence json marshaling

* Fix tests

Co-authored-by: Aaron Craelius <aaron@regen.network>
Co-authored-by: Aaron Craelius <aaronc@users.noreply.github.com>
Co-authored-by: Federico Kunze <31522760+fedekunze@users.noreply.github.com>
This commit is contained in:
Anil Kumar Kammari
2020-07-25 08:03:58 +00:00
committed by GitHub
co-authored by Aaron Craelius Aaron Craelius Federico Kunze
parent c6f3a1706f
commit 3bafd8255a
54 changed files with 354 additions and 359 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x/slashing/keeper/keeper.go
+2 -2
View File
@@ -16,13 +16,13 @@ import (
// Keeper of the slashing store
type Keeper struct {
storeKey sdk.StoreKey
cdc codec.Marshaler
cdc codec.BinaryMarshaler
sk types.StakingKeeper
paramspace types.ParamSubspace
}
// NewKeeper creates a slashing keeper
func NewKeeper(cdc codec.Marshaler, key sdk.StoreKey, sk types.StakingKeeper, paramspace types.ParamSubspace) Keeper {
func NewKeeper(cdc codec.BinaryMarshaler, key sdk.StoreKey, sk types.StakingKeeper, paramspace types.ParamSubspace) Keeper {
// set KeyTable if it has not already been set
if !paramspace.HasKeyTable() {
paramspace = paramspace.WithKeyTable(types.ParamKeyTable())
x/slashing/keeper/querier.go
+12 -12
View File
@@ -11,17 +11,17 @@ import (
)
// NewQuerier creates a new querier for slashing clients.
func NewQuerier(k Keeper) sdk.Querier {
func NewQuerier(k Keeper, legacyQuerierCdc codec.JSONMarshaler) sdk.Querier {
return func(ctx sdk.Context, path []string, req abci.RequestQuery) ([]byte, error) {
switch path[0] {
case types.QueryParameters:
return queryParams(ctx, k)
return queryParams(ctx, k, legacyQuerierCdc)
case types.QuerySigningInfo:
return querySigningInfo(ctx, req, k)
return querySigningInfo(ctx, req, k, legacyQuerierCdc)
case types.QuerySigningInfos:
return querySigningInfos(ctx, req, k)
return querySigningInfos(ctx, req, k, legacyQuerierCdc)
default:
return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown %s query endpoint: %s", types.ModuleName, path[0])
@@ -29,10 +29,10 @@ func NewQuerier(k Keeper) sdk.Querier {
}
}
func queryParams(ctx sdk.Context, k Keeper) ([]byte, error) {
func queryParams(ctx sdk.Context, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
params := k.GetParams(ctx)
res, err := codec.MarshalJSONIndent(types.ModuleCdc, params)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -40,10 +40,10 @@ func queryParams(ctx sdk.Context, k Keeper) ([]byte, error) {
return res, nil
}
func querySigningInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func querySigningInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QuerySigningInfoRequest
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -53,7 +53,7 @@ func querySigningInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte,
return nil, sdkerrors.Wrap(types.ErrNoSigningInfoFound, params.ConsAddress.String())
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, signingInfo)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, signingInfo)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -61,10 +61,10 @@ func querySigningInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte,
return res, nil
}
func querySigningInfos(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func querySigningInfos(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QuerySigningInfosParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -83,7 +83,7 @@ func querySigningInfos(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte
signingInfos = signingInfos[start:end]
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, signingInfos)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, signingInfos)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
x/slashing/keeper/querier_test.go
+4 -3
View File
@@ -17,8 +17,8 @@ func TestNewQuerier(t *testing.T) {
app := simapp.Setup(false)
ctx := app.BaseApp.NewContext(false, abci.Header{})
app.SlashingKeeper.SetParams(ctx, keeper.TestParams())
querier := keeper.NewQuerier(app.SlashingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.SlashingKeeper, legacyQuerierCdc)
query := abci.RequestQuery{
Path: "",
@@ -31,11 +31,12 @@ func TestNewQuerier(t *testing.T) {
func TestQueryParams(t *testing.T) {
cdc := codec.New()
legacyQuerierCdc := codec.NewAminoCodec(cdc)
app := simapp.Setup(false)
ctx := app.BaseApp.NewContext(false, abci.Header{})
app.SlashingKeeper.SetParams(ctx, keeper.TestParams())
querier := keeper.NewQuerier(app.SlashingKeeper)
querier := keeper.NewQuerier(app.SlashingKeeper, legacyQuerierCdc)
query := abci.RequestQuery{
Path: "",
x/slashing/module.go
+2 -2
View File
@@ -127,8 +127,8 @@ func (AppModule) QuerierRoute() string {
}
// LegacyQuerierHandler returns the slashing module sdk.Querier.
func (am AppModule) LegacyQuerierHandler(codec.JSONMarshaler) sdk.Querier {
return keeper.NewQuerier(am.keeper)
func (am AppModule) LegacyQuerierHandler(legacyQuerierCdc codec.JSONMarshaler) sdk.Querier {
return keeper.NewQuerier(am.keeper, legacyQuerierCdc)
}
// RegisterQueryService registers a GRPC query service to respond to the