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

R4R: Fix tally result #2861

Closed
wants to merge 3 commits into from
Closed

R4R: Fix tally result #2861

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa22709
Add test cases
Nov 19, 2018
b741e67
Updated keepers to increase/decrease tally on AddVote
Nov 19, 2018
1a1a71c
PENDING
Nov 19, 2018
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
Next Next commit
Add test cases
  • Loading branch information
Federico Kunze committed Nov 19, 2018
commit aa2270971b0de484559b6c7f0fccecbcdc4fae08
21 changes: 14 additions & 7 deletions client/lcd/lcd_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -696,6 +696,8 @@ func TestVote(t *testing.T) {
proposal := getProposal(t, port, proposalID)
require.Equal(t, "Test", proposal.GetTitle())

tallyOptionBefore := proposal.GetTallyResult().Yes

// create SubmitProposal TX
resultTx = doDeposit(t, port, seed, name, password, addr, proposalID, 5)
tests.WaitForHeight(resultTx.Height+1, port)
Expand All @@ -704,13 +706,18 @@ func TestVote(t *testing.T) {
proposal = getProposal(t, port, proposalID)
require.Equal(t, gov.StatusVotingPeriod, proposal.GetStatus())

option := gov.OptionYes

// create SubmitProposal TX
resultTx = doVote(t, port, seed, name, password, addr, proposalID)
resultTx = doVote(t, port, seed, name, password, addr, proposalID, option.String())
tests.WaitForHeight(resultTx.Height+1, port)

vote := getVote(t, port, proposalID, addr)
require.Equal(t, proposalID, vote.ProposalID)
require.Equal(t, gov.OptionYes, vote.Option)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not use option here since we already have a variable for it.


proposal = getProposal(t, port, proposalID)
require.Equal(t, tallyOptionBefore.Add(sdk.NewDec(1)), proposal.GetTallyResult().Yes)
}

func TestUnjail(t *testing.T) {
Expand Down Expand Up @@ -800,13 +807,13 @@ func TestProposalsQuery(t *testing.T) {
require.Equal(t, proposalID3, proposals[1].GetProposalID())

// Addr1 votes on proposals #2 & #3
resultTx = doVote(t, port, seeds[0], names[0], passwords[0], addrs[0], proposalID2)
resultTx = doVote(t, port, seeds[0], names[0], passwords[0], addrs[0], proposalID2, gov.OptionYes.String())
tests.WaitForHeight(resultTx.Height+1, port)
resultTx = doVote(t, port, seeds[0], names[0], passwords[0], addrs[0], proposalID3)
resultTx = doVote(t, port, seeds[0], names[0], passwords[0], addrs[0], proposalID3, gov.OptionYes.String())
tests.WaitForHeight(resultTx.Height+1, port)

// Addr2 votes on proposal #3
resultTx = doVote(t, port, seeds[1], names[1], passwords[1], addrs[1], proposalID3)
resultTx = doVote(t, port, seeds[1], names[1], passwords[1], addrs[1], proposalID3, gov.OptionYes.String())
tests.WaitForHeight(resultTx.Height+1, port)

// Test query all proposals
Expand Down Expand Up @@ -1441,7 +1448,7 @@ func doDeposit(t *testing.T, port, seed, name, password string, proposerAddr sdk
return results
}

func doVote(t *testing.T, port, seed, name, password string, proposerAddr sdk.AccAddress, proposalID uint64) (resultTx ctypes.ResultBroadcastTxCommit) {
func doVote(t *testing.T, port, seed, name, password string, proposerAddr sdk.AccAddress, proposalID uint64, option string) (resultTx ctypes.ResultBroadcastTxCommit) {
// get the account to get the sequence
acc := getAccount(t, port, proposerAddr)
accnum := acc.GetAccountNumber()
Expand All @@ -1452,15 +1459,15 @@ func doVote(t *testing.T, port, seed, name, password string, proposerAddr sdk.Ac
// vote on proposal
jsonStr := []byte(fmt.Sprintf(`{
"voter": "%s",
"option": "Yes",
"option": "%s",
"base_req": {
"name": "%s",
"password": "%s",
"chain_id": "%s",
"account_number": "%d",
"sequence": "%d"
}
}`, proposerAddr, name, password, chainID, accnum, sequence))
}`, proposerAddr, option, name, password, chainID, accnum, sequence))
res, body := Request(t, port, "POST", fmt.Sprintf("/gov/proposals/%d/votes", proposalID), jsonStr)
require.Equal(t, http.StatusOK, res.StatusCode, body)

Expand Down
7 changes: 7 additions & 0 deletions x/gov/keeper_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,7 @@ func TestVotes(t *testing.T) {

proposal := keeper.NewTextProposal(ctx, "Test", "description", ProposalTypeText)
proposalID := proposal.GetProposalID()
initialTally := proposal.GetTallyResult()

proposal.SetStatus(StatusVotingPeriod)
keeper.SetProposal(ctx, proposal)
Expand Down Expand Up @@ -202,6 +203,12 @@ func TestVotes(t *testing.T) {
votesIterator.Next()
require.False(t, votesIterator.Valid())
votesIterator.Close()

// Test Proposal Tally increased
proposal = keeper.GetProposal(ctx, proposalID)
finalTally := proposal.GetTallyResult()
require.Equal(t, initialTally.Yes.Add(sdk.NewDec(1)), finalTally.Yes)
require.Equal(t, initialTally.NoWithVeto.Add(sdk.NewDec(1)), finalTally.NoWithVeto)
}

func TestProposalQueues(t *testing.T) {
Expand Down