reduce module interdependancy, /client refactor (#4415)
* abstract staking BuildCreateValidatorMsg, genutil defines its own flags * client/ refactor * staking move keys from keeper to types
This commit is contained in:
frog power 4000
committed by
Alessio Treglia
Alessio Treglia
parent
91e75cb74a
commit
73e5ef7c13
@@ -10,7 +10,7 @@ import (
|
||||
"github.com/cosmos/cosmos-sdk/codec"
|
||||
sdk "github.com/cosmos/cosmos-sdk/types"
|
||||
"github.com/cosmos/cosmos-sdk/version"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking/querier"
|
||||
"github.com/cosmos/cosmos-sdk/x/staking/types"
|
||||
)
|
||||
|
||||
@@ -37,7 +37,7 @@ $ %s query staking validator cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ldmqhff
|
||||
return err
|
||||
}
|
||||
|
||||
res, err := cliCtx.QueryStore(staking.GetValidatorKey(addr), storeName)
|
||||
res, err := cliCtx.QueryStore(types.GetValidatorKey(addr), storeName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -69,12 +69,12 @@ $ %s query staking validators
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
cliCtx := context.NewCLIContext().WithCodec(cdc)
|
||||
|
||||
resKVs, err := cliCtx.QuerySubspace(staking.ValidatorsKey, storeName)
|
||||
resKVs, err := cliCtx.QuerySubspace(types.ValidatorsKey, storeName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var validators staking.Validators
|
||||
var validators types.Validators
|
||||
for _, kv := range resKVs {
|
||||
validators = append(validators, types.MustUnmarshalValidator(cdc, kv.Value))
|
||||
}
|
||||
@@ -107,18 +107,18 @@ $ %s query staking unbonding-delegations-from cosmosvaloper1gghjut3ccd8ay0zduzj6
|
||||
return err
|
||||
}
|
||||
|
||||
bz, err := cdc.MarshalJSON(staking.NewQueryValidatorParams(valAddr))
|
||||
bz, err := cdc.MarshalJSON(querier.NewQueryValidatorParams(valAddr))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, staking.QueryValidatorUnbondingDelegations)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, querier.QueryValidatorUnbondingDelegations)
|
||||
res, err := cliCtx.QueryWithData(route, bz)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var ubds staking.UnbondingDelegations
|
||||
var ubds types.UnbondingDelegations
|
||||
cdc.MustUnmarshalJSON(res, &ubds)
|
||||
return cliCtx.PrintOutput(ubds)
|
||||
},
|
||||
@@ -149,18 +149,18 @@ $ %s query staking redelegations-from cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fx
|
||||
return err
|
||||
}
|
||||
|
||||
bz, err := cdc.MarshalJSON(staking.QueryRedelegationParams{SrcValidatorAddr: valSrcAddr})
|
||||
bz, err := cdc.MarshalJSON(querier.QueryRedelegationParams{SrcValidatorAddr: valSrcAddr})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, staking.QueryRedelegations)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, querier.QueryRedelegations)
|
||||
res, err := cliCtx.QueryWithData(route, bz)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var resp staking.RedelegationResponses
|
||||
var resp types.RedelegationResponses
|
||||
if err := cdc.UnmarshalJSON(res, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -198,18 +198,18 @@ $ %s query staking delegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p cosm
|
||||
return err
|
||||
}
|
||||
|
||||
bz, err := cdc.MarshalJSON(staking.NewQueryBondsParams(delAddr, valAddr))
|
||||
bz, err := cdc.MarshalJSON(querier.NewQueryBondsParams(delAddr, valAddr))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, staking.QueryDelegation)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, querier.QueryDelegation)
|
||||
res, err := cliCtx.QueryWithData(route, bz)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var resp staking.DelegationResponse
|
||||
var resp types.DelegationResponse
|
||||
if err := cdc.UnmarshalJSON(res, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -243,18 +243,18 @@ $ %s query staking delegations cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p
|
||||
return err
|
||||
}
|
||||
|
||||
bz, err := cdc.MarshalJSON(staking.NewQueryDelegatorParams(delAddr))
|
||||
bz, err := cdc.MarshalJSON(querier.NewQueryDelegatorParams(delAddr))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, staking.QueryDelegatorDelegations)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, querier.QueryDelegatorDelegations)
|
||||
res, err := cliCtx.QueryWithData(route, bz)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var resp staking.DelegationResponses
|
||||
var resp types.DelegationResponses
|
||||
if err := cdc.UnmarshalJSON(res, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -288,18 +288,18 @@ $ %s query staking delegations-to cosmosvaloper1gghjut3ccd8ay0zduzj64hwre2fxs9ld
|
||||
return err
|
||||
}
|
||||
|
||||
bz, err := cdc.MarshalJSON(staking.NewQueryValidatorParams(valAddr))
|
||||
bz, err := cdc.MarshalJSON(querier.NewQueryValidatorParams(valAddr))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, staking.QueryValidatorDelegations)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, querier.QueryValidatorDelegations)
|
||||
res, err := cliCtx.QueryWithData(route, bz)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var resp staking.DelegationResponses
|
||||
var resp types.DelegationResponses
|
||||
if err := cdc.UnmarshalJSON(res, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -338,7 +338,7 @@ $ %s query staking unbonding-delegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld7
|
||||
return err
|
||||
}
|
||||
|
||||
res, err := cliCtx.QueryStore(staking.GetUBDKey(delAddr, valAddr), storeName)
|
||||
res, err := cliCtx.QueryStore(types.GetUBDKey(delAddr, valAddr), storeName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -373,12 +373,12 @@ $ %s query staking unbonding-delegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld7
|
||||
return err
|
||||
}
|
||||
|
||||
resKVs, err := cliCtx.QuerySubspace(staking.GetUBDsKey(delegatorAddr), storeName)
|
||||
resKVs, err := cliCtx.QuerySubspace(types.GetUBDsKey(delegatorAddr), storeName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var ubds staking.UnbondingDelegations
|
||||
var ubds types.UnbondingDelegations
|
||||
for _, kv := range resKVs {
|
||||
ubds = append(ubds, types.MustUnmarshalUBD(cdc, kv.Value))
|
||||
}
|
||||
@@ -422,18 +422,18 @@ $ %s query staking redelegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p co
|
||||
return err
|
||||
}
|
||||
|
||||
bz, err := cdc.MarshalJSON(staking.NewQueryRedelegationParams(delAddr, valSrcAddr, valDstAddr))
|
||||
bz, err := cdc.MarshalJSON(querier.NewQueryRedelegationParams(delAddr, valSrcAddr, valDstAddr))
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, staking.QueryRedelegations)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, querier.QueryRedelegations)
|
||||
res, err := cliCtx.QueryWithData(route, bz)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var resp staking.RedelegationResponses
|
||||
var resp types.RedelegationResponses
|
||||
if err := cdc.UnmarshalJSON(res, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -467,18 +467,18 @@ $ %s query staking redelegation cosmos1gghjut3ccd8ay0zduzj64hwre2fxs9ld75ru9p
|
||||
return err
|
||||
}
|
||||
|
||||
bz, err := cdc.MarshalJSON(staking.QueryRedelegationParams{DelegatorAddr: delAddr})
|
||||
bz, err := cdc.MarshalJSON(querier.QueryRedelegationParams{DelegatorAddr: delAddr})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, staking.QueryRedelegations)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeKey, querier.QueryRedelegations)
|
||||
res, err := cliCtx.QueryWithData(route, bz)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var resp staking.RedelegationResponses
|
||||
var resp types.RedelegationResponses
|
||||
if err := cdc.UnmarshalJSON(res, &resp); err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -506,7 +506,7 @@ $ %s query staking pool
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
cliCtx := context.NewCLIContext().WithCodec(cdc)
|
||||
|
||||
res, err := cliCtx.QueryStore(staking.PoolKey, storeName)
|
||||
res, err := cliCtx.QueryStore(types.PoolKey, storeName)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
@@ -534,13 +534,13 @@ $ %s query staking params
|
||||
RunE: func(cmd *cobra.Command, args []string) error {
|
||||
cliCtx := context.NewCLIContext().WithCodec(cdc)
|
||||
|
||||
route := fmt.Sprintf("custom/%s/%s", storeName, staking.QueryParameters)
|
||||
route := fmt.Sprintf("custom/%s/%s", storeName, querier.QueryParameters)
|
||||
bz, err := cliCtx.QueryWithData(route, nil)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
var params staking.Params
|
||||
var params types.Params
|
||||
cdc.MustUnmarshalJSON(bz, ¶ms)
|
||||
return cliCtx.PrintOutput(params)
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user