Merge PR: Duplicated votes query information by REST way (#165)

* FIX: Duplicated votes query information by REST way * FIX: pass ut
okx · May 25, 2020 · 5157b6c · 5157b6c
1 parent ab9d514
commit 5157b6c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 18 deletions.
diff --git a/x/staking/client/cli/query.go b/x/staking/client/cli/query.go
@@ -364,7 +364,7 @@ $ %s query staking votes-to okchainvaloper1alq9na49n9yycysh889rl90g9nhe58lcs50wu
 				return err
 			}
 
-			bytes, err := cdc.MarshalJSON(types.NewQueryValidatorVotesParams(valAddr))
+			bytes, err := cdc.MarshalJSON(types.NewQueryValidatorParams(valAddr))
 			if err != nil {
 				return err
 			}

diff --git a/x/staking/common_test.go b/x/staking/common_test.go
@@ -782,7 +782,7 @@ func queryVotesToCheck(valAddr sdk.ValAddress, expVoterCnt int, expVoters []sdk.
 		q := keeper.NewQuerier(resultCtx.tc.mockKeeper.Keeper)
 		cdc := ModuleCdc
 
-		params := types.NewQueryValidatorVotesParams(valAddr)
+		params := types.NewQueryValidatorParams(valAddr)
 		bz, _ := cdc.MarshalJSON(params)
 
 		res, e := q(ctx, []string{types.QueryValidatorVotes}, abci.RequestQuery{Data: bz})

diff --git a/x/staking/keeper/querier.go b/x/staking/keeper/querier.go
@@ -167,13 +167,13 @@ func queryProxy(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, sdk.E
 }
 
 func queryValidatorVotes(ctx sdk.Context, req abci.RequestQuery, k Keeper) ([]byte, sdk.Error) {
-	var params types.QueryValidatorVotesParams
+	var params types.QueryValidatorParams
 
 	if err := types.ModuleCdc.UnmarshalJSON(req.Data, &params); err != nil {
 		return nil, sdk.ErrInternal(fmt.Sprintf("failed to parse validator votes params. %s", err))
 	}
 
-	voteResponses := k.GetValidatorVotes(ctx, params.ValAddr)
+	voteResponses := k.GetValidatorVotes(ctx, params.ValidatorAddr)
 	resp, err := codec.MarshalJSONIndent(types.ModuleCdc, voteResponses)
 	if err != nil {
 		return nil, defaultQueryErrJSONMarshal(err)

diff --git a/x/staking/types/querier.go b/x/staking/types/querier.go
@@ -19,23 +19,9 @@ const (
 	QueryDelegator           = "delegator"
 )
 
-// QueryValidatorVotesParams defines the params for the following queries:
-// - 'custom/staking/validatorVotes'
-type QueryValidatorVotesParams struct {
-	ValAddr sdk.ValAddress
-}
-
-// NewQueryValidatorVotesParams creates a new instance of QueryValidatorVotesParams
-func NewQueryValidatorVotesParams(valAddr sdk.ValAddress) QueryValidatorVotesParams {
-	return QueryValidatorVotesParams{
-		valAddr,
-	}
-}
-
 // QueryDelegatorParams defines the params for the following queries:
 // - 'custom/staking/delegatorDelegations'
 // - 'custom/staking/delegatorUnbondingDelegations'
-// - 'custom/staking/delegatorRedelegations'
 // - 'custom/staking/delegatorValidators'
 type QueryDelegatorParams struct {
 	DelegatorAddr sdk.AccAddress