Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bugfix gov votes querier to use proposal params for proposal query #7589

Merged
merged 4 commits into from
Oct 20, 2020
Merged

Bugfix gov votes querier to use proposal params for proposal query #7589

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e33288
bugfix gov votes querier to use votes params
yun-yeo Oct 19, 2020
e4751ac
move partially used statement to the proper block
yun-yeo Oct 20, 2020
b9abb7f
Merge branch 'master' into bugfix/gov-wrong-query-votes-params
alexanderbez Oct 20, 2020
4e0e6c2
Merge branch 'master' into bugfix/gov-wrong-query-votes-params
mergify[bot] Oct 20, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions x/gov/client/rest/query.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,9 +337,7 @@ func queryVotesOnProposalHandlerFn(clientCtx client.Context) http.HandlerFunc {
return
}

params := types.NewQueryProposalVotesParams(proposalID, page, limit)

bz, err := clientCtx.LegacyAmino.MarshalJSON(params)
bz, err := clientCtx.LegacyAmino.MarshalJSON(types.NewQueryProposalParams(proposalID))
if rest.CheckBadRequestError(w, err) {
return
}
Expand All @@ -356,10 +354,17 @@ func queryVotesOnProposalHandlerFn(clientCtx client.Context) http.HandlerFunc {

// For inactive proposals we must query the txs directly to get the votes
// as they're no longer in state.
params := types.NewQueryProposalVotesParams(proposalID, page, limit)

propStatus := proposal.Status
if !(propStatus == types.StatusVotingPeriod || propStatus == types.StatusDepositPeriod) {
res, err = gcutils.QueryVotesByTxQuery(clientCtx, params)
} else {
bz, err = clientCtx.LegacyAmino.MarshalJSON(params)
if rest.CheckBadRequestError(w, err) {
return
}

res, _, err = clientCtx.QueryWithData("custom/gov/votes", bz)
}

Expand Down