Voting: fix bug with required support

Address PR aragon#458 comments.
ConsiderItDone · Sep 18, 2018 · 7571bd0 · 7571bd0
1 parent bbce73d
commit 7571bd0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apps/voting/contracts/Voting.sol b/apps/voting/contracts/Voting.sol
@@ -196,7 +196,7 @@ contract Voting is IForwarder, AragonApp {
         }
 
         // Voting is already decided
-        if (_isValuePct(vote_.yea, vote_.totalVoters, supportRequiredPct)) {
+        if (_isValuePct(vote_.yea, vote_.totalVoters, vote_.supportRequiredPct)) {
             return true;
         }
 
@@ -207,7 +207,7 @@ contract Voting is IForwarder, AragonApp {
             return false;
         }
         // Has enough support?
-        if (!_isValuePct(vote_.yea, totalVotes, supportRequiredPct)) {
+        if (!_isValuePct(vote_.yea, totalVotes, vote_.supportRequiredPct)) {
             return false;
         }
         // Has min quorum?

diff --git a/apps/voting/test/voting.js b/apps/voting/test/voting.js
@@ -154,7 +154,7 @@ contract('Voting App', accounts => {
             assert.equal((await voting.supportRequiredPct()).toString(), neededSupport.add(1).toString(), 'should have changed required support')
         })
 
-        it('fails changing required supoprt lower than minimum acceptance quorum', async () => {
+        it('fails changing required support lower than minimum acceptance quorum', async () => {
             return assertRevert(async () => {
                 await voting.changeSupportRequiredPct(minimumAcceptanceQuorum.minus(1))
             })
@@ -225,12 +225,13 @@ contract('Voting App', accounts => {
                 // with new quorum at 70% it shouldn't have, but since min quorum is snapshotted
                 // it will succeed
 
-                await voting.vote(voteId, true, true, { from: holder50 })
-                await voting.vote(voteId, true, true, { from: holder19 })
+                await voting.vote(voteId, true, false, { from: holder50 })
+                await voting.vote(voteId, true, false, { from: holder19 })
+                await voting.vote(voteId, false, false, { from: holder31 })
                 await timeTravel(votingTime + 1)
 
                 const state = await voting.getVote(voteId)
-              assert.equal(state[5].toNumber(), neededSupport.toNumber(), 'required support in vote should stay equal')
+                assert.equal(state[5].toNumber(), neededSupport.toNumber(), 'required support in vote should stay equal')
                 await voting.executeVote(voteId) // exec doesn't fail
             })
 
@@ -241,7 +242,6 @@ contract('Voting App', accounts => {
                 // with new quorum at 50% it shouldn't have, but since min quorum is snapshotted
                 // it will succeed
 
-
                 await voting.vote(voteId, true, true, { from: holder31 })
                 await timeTravel(votingTime + 1)