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/mint/keeper/keeper.go
+2 -2
View File
@@ -13,7 +13,7 @@ import (
// Keeper of the mint store
type Keeper struct {
cdc codec.Marshaler
cdc codec.BinaryMarshaler
storeKey sdk.StoreKey
paramSpace paramtypes.Subspace
stakingKeeper types.StakingKeeper
@@ -23,7 +23,7 @@ type Keeper struct {
// NewKeeper creates a new mint Keeper instance
func NewKeeper(
cdc codec.Marshaler, key sdk.StoreKey, paramSpace paramtypes.Subspace,
cdc codec.BinaryMarshaler, key sdk.StoreKey, paramSpace paramtypes.Subspace,
sk types.StakingKeeper, ak types.AccountKeeper, bk types.BankKeeper,
feeCollectorName string,
) Keeper {
x/mint/keeper/querier.go
+10 -10
View File
@@ -10,17 +10,17 @@ import (
)
// NewQuerier returns a minting Querier handler.
func NewQuerier(k Keeper) sdk.Querier {
func NewQuerier(k Keeper, legacyQuerierCdc codec.JSONMarshaler) sdk.Querier {
return func(ctx sdk.Context, path []string, _ abci.RequestQuery) ([]byte, error) {
switch path[0] {
case types.QueryParameters:
return queryParams(ctx, k)
return queryParams(ctx, k, legacyQuerierCdc)
case types.QueryInflation:
return queryInflation(ctx, k)
return queryInflation(ctx, k, legacyQuerierCdc)
case types.QueryAnnualProvisions:
return queryAnnualProvisions(ctx, k)
return queryAnnualProvisions(ctx, k, legacyQuerierCdc)
default:
return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown query path: %s", path[0])
@@ -28,10 +28,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(k.cdc, params)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -39,10 +39,10 @@ func queryParams(ctx sdk.Context, k Keeper) ([]byte, error) {
return res, nil
}
func queryInflation(ctx sdk.Context, k Keeper) ([]byte, error) {
func queryInflation(ctx sdk.Context, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
minter := k.GetMinter(ctx)
res, err := codec.MarshalJSONIndent(k.cdc, minter.Inflation)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, minter.Inflation)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -50,10 +50,10 @@ func queryInflation(ctx sdk.Context, k Keeper) ([]byte, error) {
return res, nil
}
func queryAnnualProvisions(ctx sdk.Context, k Keeper) ([]byte, error) {
func queryAnnualProvisions(ctx sdk.Context, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
minter := k.GetMinter(ctx)
res, err := codec.MarshalJSONIndent(k.cdc, minter.AnnualProvisions)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, minter.AnnualProvisions)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
x/mint/keeper/querier_test.go
+10 -4
View File
@@ -3,6 +3,8 @@ package keeper_test
import (
"testing"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/stretchr/testify/require"
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,7 +16,8 @@ import (
func TestNewQuerier(t *testing.T) {
app, ctx := createTestApp(true)
querier := keep.NewQuerier(app.MintKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keep.NewQuerier(app.MintKeeper, legacyQuerierCdc)
query := abci.RequestQuery{
Path: "",
@@ -36,7 +39,8 @@ func TestNewQuerier(t *testing.T) {
func TestQueryParams(t *testing.T) {
app, ctx := createTestApp(true)
querier := keep.NewQuerier(app.MintKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keep.NewQuerier(app.MintKeeper, legacyQuerierCdc)
var params types.Params
@@ -51,7 +55,8 @@ func TestQueryParams(t *testing.T) {
func TestQueryInflation(t *testing.T) {
app, ctx := createTestApp(true)
querier := keep.NewQuerier(app.MintKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keep.NewQuerier(app.MintKeeper, legacyQuerierCdc)
var inflation sdk.Dec
@@ -66,7 +71,8 @@ func TestQueryInflation(t *testing.T) {
func TestQueryAnnualProvisions(t *testing.T) {
app, ctx := createTestApp(true)
querier := keep.NewQuerier(app.MintKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keep.NewQuerier(app.MintKeeper, legacyQuerierCdc)
var annualProvisions sdk.Dec
x/mint/module.go
+2 -2
View File
@@ -112,8 +112,8 @@ func (AppModule) QuerierRoute() string {
}
// LegacyQuerierHandler returns the mint 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