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/staking/keeper/keeper.go
+2 -2
View File
@@ -23,7 +23,7 @@ var _ types.DelegationSet = Keeper{}
// keeper of the staking store
type Keeper struct {
storeKey sdk.StoreKey
cdc codec.Marshaler
cdc codec.BinaryMarshaler
authKeeper types.AccountKeeper
bankKeeper types.BankKeeper
hooks types.StakingHooks
@@ -34,7 +34,7 @@ type Keeper struct {
// NewKeeper creates a new staking Keeper instance
func NewKeeper(
cdc codec.Marshaler, key sdk.StoreKey, ak types.AccountKeeper, bk types.BankKeeper,
cdc codec.BinaryMarshaler, key sdk.StoreKey, ak types.AccountKeeper, bk types.BankKeeper,
ps paramtypes.Subspace,
) Keeper {
// set KeyTable if it has not already been set
x/staking/keeper/querier.go
+55 -55
View File
@@ -14,50 +14,50 @@ import (
)
// creates a querier for staking REST endpoints
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.QueryValidators:
return queryValidators(ctx, req, k)
return queryValidators(ctx, req, k, legacyQuerierCdc)
case types.QueryValidator:
return queryValidator(ctx, req, k)
return queryValidator(ctx, req, k, legacyQuerierCdc)
case types.QueryValidatorDelegations:
return queryValidatorDelegations(ctx, req, k)
return queryValidatorDelegations(ctx, req, k, legacyQuerierCdc)
case types.QueryValidatorUnbondingDelegations:
return queryValidatorUnbondingDelegations(ctx, req, k)
return queryValidatorUnbondingDelegations(ctx, req, k, legacyQuerierCdc)
case types.QueryDelegation:
return queryDelegation(ctx, req, k)
return queryDelegation(ctx, req, k, legacyQuerierCdc)
case types.QueryUnbondingDelegation:
return queryUnbondingDelegation(ctx, req, k)
return queryUnbondingDelegation(ctx, req, k, legacyQuerierCdc)
case types.QueryDelegatorDelegations:
return queryDelegatorDelegations(ctx, req, k)
return queryDelegatorDelegations(ctx, req, k, legacyQuerierCdc)
case types.QueryDelegatorUnbondingDelegations:
return queryDelegatorUnbondingDelegations(ctx, req, k)
return queryDelegatorUnbondingDelegations(ctx, req, k, legacyQuerierCdc)
case types.QueryRedelegations:
return queryRedelegations(ctx, req, k)
return queryRedelegations(ctx, req, k, legacyQuerierCdc)
case types.QueryDelegatorValidators:
return queryDelegatorValidators(ctx, req, k)
return queryDelegatorValidators(ctx, req, k, legacyQuerierCdc)
case types.QueryDelegatorValidator:
return queryDelegatorValidator(ctx, req, k)
return queryDelegatorValidator(ctx, req, k, legacyQuerierCdc)
case types.QueryHistoricalInfo:
return queryHistoricalInfo(ctx, req, k)
return queryHistoricalInfo(ctx, req, k, legacyQuerierCdc)
case types.QueryPool:
return queryPool(ctx, k)
return queryPool(ctx, k, legacyQuerierCdc)
case types.QueryParameters:
return queryParameters(ctx, k)
return queryParameters(ctx, k, legacyQuerierCdc)
default:
return nil, sdkerrors.Wrapf(sdkerrors.ErrUnknownRequest, "unknown %s query endpoint: %s", types.ModuleName, path[0])
@@ -65,10 +65,10 @@ func NewQuerier(k Keeper) sdk.Querier {
}
}
func queryValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryValidatorsParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -89,7 +89,7 @@ func queryValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte,
filteredVals = filteredVals[start:end]
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, filteredVals)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, filteredVals)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -97,10 +97,10 @@ func queryValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte,
return res, nil
}
func queryValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryValidatorParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -110,7 +110,7 @@ func queryValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, e
return nil, types.ErrNoValidatorFound
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, validator)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, validator)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -118,10 +118,10 @@ func queryValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, e
return res, nil
}
func queryValidatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryValidatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryValidatorParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -144,7 +144,7 @@ func queryValidatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper)
delegationResps = types.DelegationResponses{}
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, delegationResps)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, delegationResps)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -152,10 +152,10 @@ func queryValidatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper)
return res, nil
}
func queryValidatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryValidatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryValidatorParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -172,7 +172,7 @@ func queryValidatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery,
unbonds = unbonds[start:end]
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, unbonds)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, unbonds)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -180,10 +180,10 @@ func queryValidatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery,
return res, nil
}
func queryDelegatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryDelegatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryDelegatorParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -199,7 +199,7 @@ func queryDelegatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper)
delegationResps = types.DelegationResponses{}
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, delegationResps)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, delegationResps)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -207,10 +207,10 @@ func queryDelegatorDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper)
return res, nil
}
func queryDelegatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryDelegatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryDelegatorParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -220,7 +220,7 @@ func queryDelegatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery,
unbondingDelegations = types.UnbondingDelegations{}
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, unbondingDelegations)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, unbondingDelegations)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -228,12 +228,12 @@ func queryDelegatorUnbondingDelegations(ctx sdk.Context, req abci.RequestQuery,
return res, nil
}
func queryDelegatorValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryDelegatorValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryDelegatorParams
stakingParams := k.GetParams(ctx)
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -243,7 +243,7 @@ func queryDelegatorValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper)
validators = types.Validators{}
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, validators)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, validators)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -251,10 +251,10 @@ func queryDelegatorValidators(ctx sdk.Context, req abci.RequestQuery, k Keeper)
return res, nil
}
func queryDelegatorValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryDelegatorValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryDelegatorValidatorRequest
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -264,7 +264,7 @@ func queryDelegatorValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper) (
return nil, err
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, validator)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, validator)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -272,10 +272,10 @@ func queryDelegatorValidator(ctx sdk.Context, req abci.RequestQuery, k Keeper) (
return res, nil
}
func queryDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryDelegatorValidatorRequest
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -290,7 +290,7 @@ func queryDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte,
return nil, err
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, delegationResp)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, delegationResp)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -298,10 +298,10 @@ func queryDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte,
return res, nil
}
func queryUnbondingDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryUnbondingDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryDelegatorValidatorRequest
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -311,7 +311,7 @@ func queryUnbondingDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper)
return nil, types.ErrNoUnbondingDelegation
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, unbond)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, unbond)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -319,10 +319,10 @@ func queryUnbondingDelegation(ctx sdk.Context, req abci.RequestQuery, k Keeper)
return res, nil
}
func queryRedelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryRedelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryRedelegationParams
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -352,7 +352,7 @@ func queryRedelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byt
redelResponses = types.RedelegationResponses{}
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, redelResponses)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, redelResponses)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -360,10 +360,10 @@ func queryRedelegations(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byt
return res, nil
}
func queryHistoricalInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, error) {
func queryHistoricalInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
var params types.QueryHistoricalInfoRequest
err := types.ModuleCdc.UnmarshalJSON(req.Data, &params)
err := legacyQuerierCdc.UnmarshalJSON(req.Data, &params)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONUnmarshal, err.Error())
}
@@ -373,7 +373,7 @@ func queryHistoricalInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]by
return nil, types.ErrNoHistoricalInfo
}
res, err := codec.MarshalJSONIndent(types.ModuleCdc, hi)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, hi)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -381,7 +381,7 @@ func queryHistoricalInfo(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]by
return res, nil
}
func queryPool(ctx sdk.Context, k Keeper) ([]byte, error) {
func queryPool(ctx sdk.Context, k Keeper, legacyQuerierCdc codec.JSONMarshaler) ([]byte, error) {
bondDenom := k.BondDenom(ctx)
bondedPool := k.GetBondedPool(ctx)
notBondedPool := k.GetNotBondedPool(ctx)
@@ -395,7 +395,7 @@ func queryPool(ctx sdk.Context, k Keeper) ([]byte, error) {
k.bankKeeper.GetBalance(ctx, bondedPool.GetAddress(), bondDenom).Amount,
)
res, err := codec.MarshalJSONIndent(types.ModuleCdc, pool)
res, err := codec.MarshalJSONIndent(legacyQuerierCdc, pool)
if err != nil {
return nil, sdkerrors.Wrap(sdkerrors.ErrJSONMarshal, err.Error())
}
@@ -403,10 +403,10 @@ func queryPool(ctx sdk.Context, k Keeper) ([]byte, error) {
return res, nil
}
func queryParameters(ctx sdk.Context, k Keeper) ([]byte, error) {
func queryParameters(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())
}
x/staking/keeper/querier_test.go
+18 -8
View File
@@ -4,6 +4,8 @@ import (
"fmt"
"testing"
"github.com/cosmos/cosmos-sdk/codec"
"github.com/stretchr/testify/require"
abci "github.com/tendermint/tendermint/abci/types"
@@ -43,7 +45,8 @@ func TestNewQuerier(t *testing.T) {
Data: []byte{},
}
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
bz, err := querier(ctx, []string{"other"}, query)
require.Error(t, err)
@@ -107,7 +110,8 @@ func TestNewQuerier(t *testing.T) {
func TestQueryParametersPool(t *testing.T) {
cdc, app, ctx := createTestInput()
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
bondDenom := sdk.DefaultBondDenom
@@ -133,7 +137,8 @@ func TestQueryParametersPool(t *testing.T) {
func TestQueryValidators(t *testing.T) {
cdc, app, ctx := createTestInput()
params := app.StakingKeeper.GetParams(ctx)
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
addrs := simapp.AddTestAddrs(app, ctx, 500, sdk.TokensFromConsensusPower(10000))
@@ -200,7 +205,8 @@ func TestQueryValidators(t *testing.T) {
func TestQueryDelegation(t *testing.T) {
cdc, app, ctx := createTestInput()
params := app.StakingKeeper.GetParams(ctx)
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.TokensFromConsensusPower(10000))
addrAcc1, addrAcc2 := addrs[0], addrs[1]
@@ -448,7 +454,8 @@ func TestQueryValidatorDelegations_Pagination(t *testing.T) {
}
cdc, app, ctx := createTestInput()
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
addrs := simapp.AddTestAddrs(app, ctx, 100, sdk.TokensFromConsensusPower(10000))
pubKeys := simapp.CreateTestPubKeys(1)
@@ -532,7 +539,8 @@ func TestQueryValidatorDelegations_Pagination(t *testing.T) {
func TestQueryRedelegations(t *testing.T) {
cdc, app, ctx := createTestInput()
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.TokensFromConsensusPower(10000))
addrAcc1, addrAcc2 := addrs[0], addrs[1]
@@ -603,7 +611,8 @@ func TestQueryRedelegations(t *testing.T) {
func TestQueryUnbondingDelegation(t *testing.T) {
cdc, app, ctx := createTestInput()
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.TokensFromConsensusPower(10000))
addrAcc1, addrAcc2 := addrs[0], addrs[1]
@@ -698,7 +707,8 @@ func TestQueryUnbondingDelegation(t *testing.T) {
func TestQueryHistoricalInfo(t *testing.T) {
cdc, app, ctx := createTestInput()
querier := keeper.NewQuerier(app.StakingKeeper)
legacyQuerierCdc := codec.NewAminoCodec(app.Codec())
querier := keeper.NewQuerier(app.StakingKeeper, legacyQuerierCdc)
addrs := simapp.AddTestAddrs(app, ctx, 2, sdk.TokensFromConsensusPower(10000))
addrAcc1, addrAcc2 := addrs[0], addrs[1]
x/staking/module.go
+2 -2
View File
@@ -123,8 +123,8 @@ func (AppModule) QuerierRoute() string {
}
// LegacyQuerierHandler returns the staking 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
x/staking/types/delegation.go
+9 -9
View File
@@ -38,13 +38,13 @@ func NewDelegation(delegatorAddr sdk.AccAddress, validatorAddr sdk.ValAddress, s
}
// MustMarshalDelegation returns the delegation bytes. Panics if fails
func MustMarshalDelegation(cdc codec.Marshaler, delegation Delegation) []byte {
func MustMarshalDelegation(cdc codec.BinaryMarshaler, delegation Delegation) []byte {
return cdc.MustMarshalBinaryBare(&delegation)
}
// MustUnmarshalDelegation return the unmarshaled delegation from bytes.
// Panics if fails.
func MustUnmarshalDelegation(cdc codec.Marshaler, value []byte) Delegation {
func MustUnmarshalDelegation(cdc codec.BinaryMarshaler, value []byte) Delegation {
delegation, err := UnmarshalDelegation(cdc, value)
if err != nil {
panic(err)
@@ -54,7 +54,7 @@ func MustUnmarshalDelegation(cdc codec.Marshaler, value []byte) Delegation {
}
// return the delegation
func UnmarshalDelegation(cdc codec.Marshaler, value []byte) (delegation Delegation, err error) {
func UnmarshalDelegation(cdc codec.BinaryMarshaler, value []byte) (delegation Delegation, err error) {
err = cdc.UnmarshalBinaryBare(value, &delegation)
return delegation, err
}
@@ -126,12 +126,12 @@ func (ubd *UnbondingDelegation) RemoveEntry(i int64) {
}
// return the unbonding delegation
func MustMarshalUBD(cdc codec.Marshaler, ubd UnbondingDelegation) []byte {
func MustMarshalUBD(cdc codec.BinaryMarshaler, ubd UnbondingDelegation) []byte {
return cdc.MustMarshalBinaryBare(&ubd)
}
// unmarshal a unbonding delegation from a store value
func MustUnmarshalUBD(cdc codec.Marshaler, value []byte) UnbondingDelegation {
func MustUnmarshalUBD(cdc codec.BinaryMarshaler, value []byte) UnbondingDelegation {
ubd, err := UnmarshalUBD(cdc, value)
if err != nil {
panic(err)
@@ -141,7 +141,7 @@ func MustUnmarshalUBD(cdc codec.Marshaler, value []byte) UnbondingDelegation {
}
// unmarshal a unbonding delegation from a store value
func UnmarshalUBD(cdc codec.Marshaler, value []byte) (ubd UnbondingDelegation, err error) {
func UnmarshalUBD(cdc codec.BinaryMarshaler, value []byte) (ubd UnbondingDelegation, err error) {
err = cdc.UnmarshalBinaryBare(value, &ubd)
return ubd, err
}
@@ -220,12 +220,12 @@ func (red *Redelegation) RemoveEntry(i int64) {
}
// MustMarshalRED returns the Redelegation bytes. Panics if fails.
func MustMarshalRED(cdc codec.Marshaler, red Redelegation) []byte {
func MustMarshalRED(cdc codec.BinaryMarshaler, red Redelegation) []byte {
return cdc.MustMarshalBinaryBare(&red)
}
// MustUnmarshalRED unmarshals a redelegation from a store value. Panics if fails.
func MustUnmarshalRED(cdc codec.Marshaler, value []byte) Redelegation {
func MustUnmarshalRED(cdc codec.BinaryMarshaler, value []byte) Redelegation {
red, err := UnmarshalRED(cdc, value)
if err != nil {
panic(err)
@@ -235,7 +235,7 @@ func MustUnmarshalRED(cdc codec.Marshaler, value []byte) Redelegation {
}
// UnmarshalRED unmarshals a redelegation from a store value
func UnmarshalRED(cdc codec.Marshaler, value []byte) (red Redelegation, err error) {
func UnmarshalRED(cdc codec.BinaryMarshaler, value []byte) (red Redelegation, err error) {
err = cdc.UnmarshalBinaryBare(value, &red)
return red, err
}
x/staking/types/historical_info.go
+3 -3
View File
@@ -21,12 +21,12 @@ func NewHistoricalInfo(header abci.Header, valSet Validators) HistoricalInfo {
}
// MustMarshalHistoricalInfo wll marshal historical info and panic on error
func MustMarshalHistoricalInfo(cdc codec.Marshaler, hi HistoricalInfo) []byte {
func MustMarshalHistoricalInfo(cdc codec.BinaryMarshaler, hi HistoricalInfo) []byte {
return cdc.MustMarshalBinaryBare(&hi)
}
// MustUnmarshalHistoricalInfo wll unmarshal historical info and panic on error
func MustUnmarshalHistoricalInfo(cdc codec.Marshaler, value []byte) HistoricalInfo {
func MustUnmarshalHistoricalInfo(cdc codec.BinaryMarshaler, value []byte) HistoricalInfo {
hi, err := UnmarshalHistoricalInfo(cdc, value)
if err != nil {
panic(err)
@@ -36,7 +36,7 @@ func MustUnmarshalHistoricalInfo(cdc codec.Marshaler, value []byte) HistoricalIn
}
// UnmarshalHistoricalInfo will unmarshal historical info and return any error
func UnmarshalHistoricalInfo(cdc codec.Marshaler, value []byte) (hi HistoricalInfo, err error) {
func UnmarshalHistoricalInfo(cdc codec.BinaryMarshaler, value []byte) (hi HistoricalInfo, err error) {
err = cdc.UnmarshalBinaryBare(value, &hi)
return hi, err
x/staking/types/validator.go
+3 -3
View File
@@ -109,12 +109,12 @@ func (v Validators) Swap(i, j int) {
}
// return the redelegation
func MustMarshalValidator(cdc codec.Marshaler, validator Validator) []byte {
func MustMarshalValidator(cdc codec.BinaryMarshaler, validator Validator) []byte {
return cdc.MustMarshalBinaryBare(&validator)
}
// unmarshal a redelegation from a store value
func MustUnmarshalValidator(cdc codec.Marshaler, value []byte) Validator {
func MustUnmarshalValidator(cdc codec.BinaryMarshaler, value []byte) Validator {
validator, err := UnmarshalValidator(cdc, value)
if err != nil {
panic(err)
@@ -124,7 +124,7 @@ func MustUnmarshalValidator(cdc codec.Marshaler, value []byte) Validator {
}
// unmarshal a redelegation from a store value
func UnmarshalValidator(cdc codec.Marshaler, value []byte) (v Validator, err error) {
func UnmarshalValidator(cdc codec.BinaryMarshaler, value []byte) (v Validator, err error) {
err = cdc.UnmarshalBinaryBare(value, &v)
return v, err
}