cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #2429 from DillonBArevalo/fix-voting

Browse Source 
Add weight == 0 condition to giveRightToVote function
This commit is contained in:
chriseth 2017-06-21 17:54:55 +02:00 committed by GitHub
commit ac977cdffa
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/solidity-by-example.rst
View File

@ -94,7 +94,7 @@ of votes.
// called incorrectly. But watch out, this // called incorrectly. But watch out, this
// will currently also consume all provided gas // will currently also consume all provided gas
// (this is planned to change in the future). // (this is planned to change in the future).
require((msg.sender == chairperson) && !voters[voter].voted); require((msg.sender == chairperson) && !voters[voter].voted && (voters[voter].weight == 0));
voters[voter].weight = 1; voters[voter].weight = 1;
} }
@ -165,7 +165,7 @@ of votes.
} }
} }
} }
// Calls winningProposal() function to get the index // Calls winningProposal() function to get the index
// of the winner contained in the proposals array and then // of the winner contained in the proposals array and then
// returns the name of the winner // returns the name of the winner
@ -273,7 +273,7 @@ activate themselves.
// If the bid is not higher, send the // If the bid is not higher, send the
// money back. // money back.
require(msg.value > highestBid); require(msg.value > highestBid);
if (highestBidder != 0) { if (highestBidder != 0) {
// Sending back the money by simply using // Sending back the money by simply using
// highestBidder.send(highestBid) is a security risk // highestBidder.send(highestBid) is a security risk
@ -296,7 +296,7 @@ activate themselves.
// before `send` returns. // before `send` returns.
pendingReturns[msg.sender] = 0; pendingReturns[msg.sender] = 0;
if (!msg.sender.send(amount)) { if (!msg.sender.send(amount)) {
// No need to call throw here, just reset the amount owing // No need to call throw here, just reset the amount owing
pendingReturns[msg.sender] = amount; pendingReturns[msg.sender] = amount;
return false; return false;