|
|
|
@ -18,7 +18,7 @@ contract Ballot { |
|
|
|
|
Proposal[] proposals; |
|
|
|
|
|
|
|
|
|
/// Create a new ballot with $(_numProposals) different proposals.
|
|
|
|
|
function Ballot(uint8 _numProposals) { |
|
|
|
|
function Ballot(uint8 _numProposals) public { |
|
|
|
|
chairperson = msg.sender; |
|
|
|
|
voters[chairperson].weight = 1; |
|
|
|
|
proposals.length = _numProposals; |
|
|
|
@ -26,13 +26,13 @@ contract Ballot { |
|
|
|
|
|
|
|
|
|
/// Give $(voter) the right to vote on this ballot.
|
|
|
|
|
/// May only be called by $(chairperson).
|
|
|
|
|
function giveRightToVote(address voter) { |
|
|
|
|
function giveRightToVote(address voter) public { |
|
|
|
|
if (msg.sender != chairperson || voters[voter].voted) return; |
|
|
|
|
voters[voter].weight = 1; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/// Delegate your vote to the voter $(to).
|
|
|
|
|
function delegate(address to) { |
|
|
|
|
function delegate(address to) public { |
|
|
|
|
Voter storage sender = voters[msg.sender]; // assigns reference
|
|
|
|
|
if (sender.voted) return; |
|
|
|
|
while (voters[to].delegate != address(0) && voters[to].delegate != msg.sender) |
|
|
|
@ -48,7 +48,7 @@ contract Ballot { |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
/// Give a single vote to proposal $(proposal).
|
|
|
|
|
function vote(uint8 proposal) { |
|
|
|
|
function vote(uint8 proposal) public { |
|
|
|
|
Voter storage sender = voters[msg.sender]; |
|
|
|
|
if (sender.voted || proposal >= proposals.length) return; |
|
|
|
|
sender.voted = true; |
|
|
|
@ -56,7 +56,7 @@ contract Ballot { |
|
|
|
|
proposals[proposal].voteCount += sender.weight; |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
function winningProposal() constant returns (uint8 _winningProposal) { |
|
|
|
|
function winningProposal() public constant returns (uint8 _winningProposal) { |
|
|
|
|
uint256 winningVoteCount = 0; |
|
|
|
|
for (uint8 proposal = 0; proposal < proposals.length; proposal++) |
|
|
|
|
if (proposals[proposal].voteCount > winningVoteCount) { |
|
|
|
|