Merge branch 'master' of https://github.com/ethereum/remix-project into searchfixes
filip mertens
3 years ago
commit
07db808c22
@ -1,195 +0,0 @@ |
|||||||
'use strict' |
|
||||||
|
|
||||||
import { NightwatchBrowser } from 'nightwatch' |
|
||||||
import init from '../helpers/init' |
|
||||||
|
|
||||||
module.exports = { |
|
||||||
|
|
||||||
before: function (browser: NightwatchBrowser, done: VoidFunction) { |
|
||||||
init(browser, done) |
|
||||||
}, |
|
||||||
|
|
||||||
'Should create 10 files, reload, and check if the files are saved': function (browser: NightwatchBrowser) { |
|
||||||
const contents = {} |
|
||||||
const checkContent = function (i, done) { |
|
||||||
const name = 'test_' + i + '.sol' |
|
||||||
browser |
|
||||||
.openFile(name) |
|
||||||
.pause(500) |
|
||||||
.getEditorValue((content) => { |
|
||||||
browser.assert.ok(content === contents[i]) |
|
||||||
done() |
|
||||||
}) |
|
||||||
} |
|
||||||
browser.clickLaunchIcon('filePanel').perform((done) => { |
|
||||||
let contentEditSet = content.slice() |
|
||||||
for (let i = 0; i < 10; i++) { |
|
||||||
contentEditSet += contentEditSet |
|
||||||
contents[i] = contentEditSet |
|
||||||
const name = 'test_' + i + '.sol' |
|
||||||
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
|
||||||
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
|
||||||
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
|
||||||
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
|
||||||
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
|
||||||
.setEditorValue(contentEditSet) |
|
||||||
} |
|
||||||
done() |
|
||||||
}).pause(10000).refresh() |
|
||||||
.perform(done => checkContent(0, done)) |
|
||||||
.perform(done => checkContent(1, done)) |
|
||||||
.perform(done => checkContent(2, done)) |
|
||||||
.perform(done => checkContent(3, done)) |
|
||||||
.perform(done => checkContent(4, done)) |
|
||||||
.perform(done => checkContent(5, done)) |
|
||||||
.perform(done => checkContent(6, done)) |
|
||||||
.perform(done => checkContent(7, done)) |
|
||||||
.perform(done => checkContent(8, done)) |
|
||||||
.perform(done => checkContent(9, done)) |
|
||||||
.end() |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
const content = ` |
|
||||||
// SPDX-License-Identifier: GPL-3.0
|
|
||||||
|
|
||||||
pragma solidity >=0.7.0 <0.9.0; |
|
||||||
|
|
||||||
/** |
|
||||||
* @title Ballot |
|
||||||
* @dev Implements voting process along with vote delegation| |
|
||||||
*/ |
|
||||||
contract Ballot { |
|
||||||
|
|
||||||
struct Voter { |
|
||||||
uint weight; // weight is accumulated by delegation
|
|
||||||
bool voted; // if true, that person already voted
|
|
||||||
address delegate; // person delegated to
|
|
||||||
uint vote; // index of the voted proposal
|
|
||||||
} |
|
||||||
|
|
||||||
struct Proposal { |
|
||||||
// If you can limit the length to a certain number of bytes,
|
|
||||||
// always use one of bytes1 to bytes32 because they are much cheaper
|
|
||||||
bytes32 name; // short name (up to 32 bytes)
|
|
||||||
uint voteCount; // number of accumulated votes
|
|
||||||
} |
|
||||||
|
|
||||||
address public chairperson; |
|
||||||
|
|
||||||
mapping(address => Voter) public voters; |
|
||||||
|
|
||||||
Proposal[] public proposals; |
|
||||||
|
|
||||||
function () test { |
|
||||||
|
|
||||||
/** |
|
||||||
* @dev Create a new ballot to choose one of 'proposalNames'. |
|
||||||
* @param proposalNames names of proposals |
|
||||||
*/ |
|
||||||
constructor(bytes32[] memory proposalNames) { |
|
||||||
chairperson = msg.sender; |
|
||||||
voters[chairperson].weight = 1; |
|
||||||
|
|
||||||
for (uint i = 0; i < proposalNames.length; i++) { |
|
||||||
// 'Proposal({...})' creates a temporary
|
|
||||||
// Proposal object and 'proposals.push(...)'
|
|
||||||
// appends it to the end of 'proposals'.
|
|
||||||
proposals.push(Proposal({ |
|
||||||
name: proposalNames[i], |
|
||||||
voteCount: 0 |
|
||||||
})); |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* @dev Give 'voter' the right to vote on this ballot. May only be called by 'chairperson'. |
|
||||||
* @param voter address of voter |
|
||||||
*/ |
|
||||||
function giveRightToVote(address voter) public { |
|
||||||
require( |
|
||||||
msg.sender == chairperson, |
|
||||||
"Only chairperson can give right to vote." |
|
||||||
); |
|
||||||
require( |
|
||||||
!voters[voter].voted, |
|
||||||
"The voter already voted." |
|
||||||
); |
|
||||||
require(voters[voter].weight == 0); |
|
||||||
voters[voter].weight = 1; |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* @dev Delegate your vote to the voter 'to'. |
|
||||||
* @param to address to which vote is delegated |
|
||||||
*/ |
|
||||||
function delegate(address to) public { |
|
||||||
Voter storage sender = voters[msg.sender]; |
|
||||||
require(!sender.voted, "You already voted."); |
|
||||||
require(to != msg.sender, "Self-delegation is disallowed."); |
|
||||||
|
|
||||||
while (voters[to].delegate != address(0)) { |
|
||||||
to = voters[to].delegate; |
|
||||||
|
|
||||||
// We found a loop in the delegation, not allowed.
|
|
||||||
require(to != msg.sender, "Found loop in delegation."); |
|
||||||
} |
|
||||||
sender.voted = true; |
|
||||||
sender.delegate = to; |
|
||||||
Voter storage delegate_ = voters[to]; |
|
||||||
if (delegate_.voted) { |
|
||||||
// If the delegate already voted,
|
|
||||||
// directly add to the number of votes
|
|
||||||
proposals[delegate_.vote].voteCount += sender.weight; |
|
||||||
} else { |
|
||||||
// If the delegate did not vote yet,
|
|
||||||
// add to her weight.
|
|
||||||
delegate_.weight += sender.weight; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* @dev Give your vote (including votes delegated to you) to proposal 'proposals[proposal].name'. |
|
||||||
* @param proposal index of proposal in the proposals array |
|
||||||
*/ |
|
||||||
function vote(uint proposal) public { |
|
||||||
Voter storage sender = voters[msg.sender]; |
|
||||||
require(sender.weight != 0, "Has no right to vote"); |
|
||||||
require(!sender.voted, "Already voted."); |
|
||||||
sender.voted = true; |
|
||||||
sender.vote = proposal; |
|
||||||
|
|
||||||
// If 'proposal' is out of the range of the array,
|
|
||||||
// this will throw automatically and revert all
|
|
||||||
// changes.
|
|
||||||
proposals[proposal].voteCount += sender.weight; |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* @dev Computes the winning proposal taking all previous votes into account. |
|
||||||
* @return winningProposal_ index of winning proposal in the proposals array |
|
||||||
*/ |
|
||||||
function winningProposal() public view |
|
||||||
returns (uint winningProposal_) |
|
||||||
{ |
|
||||||
uint winningVoteCount = 0; |
|
||||||
for (uint p = 0; p < proposals.length; p++) { |
|
||||||
if (proposals[p].voteCount > winningVoteCount) { |
|
||||||
winningVoteCount = proposals[p].voteCount; |
|
||||||
winningProposal_ = p; |
|
||||||
} |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
/** |
|
||||||
* @dev Calls winningProposal() function to get the index of the winner contained in the proposals array and then |
|
||||||
* @return winnerName_ the name of the winner |
|
||||||
*/ |
|
||||||
function winnerName() public view |
|
||||||
returns (bytes32 winnerName_) |
|
||||||
{ |
|
||||||
winnerName_ = proposals[winningProposal()].name; |
|
||||||
} |
|
||||||
} |
|
||||||
|
|
||||||
` |
|
||||||
@ -0,0 +1,342 @@ |
|||||||
|
'use strict' |
||||||
|
|
||||||
|
import { NightwatchBrowser } from 'nightwatch' |
||||||
|
import init from '../helpers/init' |
||||||
|
|
||||||
|
module.exports = { |
||||||
|
|
||||||
|
before: function (browser: NightwatchBrowser, done: VoidFunction) { |
||||||
|
init(browser, done) |
||||||
|
}, |
||||||
|
|
||||||
|
'Should create 10 files, reload, and check if the files are saved': function (browser: NightwatchBrowser) { |
||||||
|
const contents = {} |
||||||
|
const checkContent = (i, done) => { |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser |
||||||
|
.openFile(name) |
||||||
|
.getEditorValue((content) => { |
||||||
|
browser.assert.ok(content === contents[i]) |
||||||
|
browser.assert.ok(content === contents[i]) |
||||||
|
done() |
||||||
|
}) |
||||||
|
} |
||||||
|
const fillContent = (content, mul) => { |
||||||
|
let localContent = content |
||||||
|
mul = 3 * mul |
||||||
|
for (let k = 0 ; k < mul; k++) { |
||||||
|
localContent += content |
||||||
|
} |
||||||
|
return localContent |
||||||
|
} |
||||||
|
browser.clickLaunchIcon('filePanel') |
||||||
|
.perform((done) => { |
||||||
|
const i = 0 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 1 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 2 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 3 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 4 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 5 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 6 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 7 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 8 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}).perform((done) => { |
||||||
|
const i = 9 |
||||||
|
const localContent = fillContent(content, i) |
||||||
|
contents[i] = localContent |
||||||
|
const name = 'test_' + i + '.sol' |
||||||
|
browser.click('[data-id="fileExplorerNewFilecreateNewFile"]') |
||||||
|
.waitForElementContainsText('*[data-id$="/blank"]', '', 60000) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', name) |
||||||
|
.sendKeys('*[data-id$="/blank"] .remixui_items', browser.Keys.ENTER) |
||||||
|
.getText('.remix_ui_terminal_block', (result) => { |
||||||
|
console.log(result) |
||||||
|
}) |
||||||
|
.waitForElementVisible(`li[data-id="treeViewLitreeViewItem${name}"]`, 60000) |
||||||
|
.setEditorValue(localContent) |
||||||
|
done() |
||||||
|
}) |
||||||
|
.pause(10000) |
||||||
|
.refresh() |
||||||
|
.perform(done => checkContent(0, done)) |
||||||
|
.perform(done => checkContent(1, done)) |
||||||
|
.perform(done => checkContent(2, done)) |
||||||
|
.perform(done => checkContent(3, done)) |
||||||
|
.perform(done => checkContent(4, done)) |
||||||
|
.perform(done => checkContent(5, done)) |
||||||
|
.perform(done => checkContent(6, done)) |
||||||
|
.perform(done => checkContent(7, done)) |
||||||
|
.perform(done => checkContent(8, done)) |
||||||
|
.perform(done => checkContent(9, done)) |
||||||
|
.end() |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
const content = ` |
||||||
|
// SPDX-License-Identifier: GPL-3.0
|
||||||
|
|
||||||
|
pragma solidity >=0.7.0 <0.9.0; |
||||||
|
|
||||||
|
/** |
||||||
|
* @title Ballot |
||||||
|
* @dev Implements voting process along with vote delegation| |
||||||
|
*/ |
||||||
|
contract Ballot { |
||||||
|
|
||||||
|
struct Voter { |
||||||
|
uint weight; // weight is accumulated by delegation
|
||||||
|
bool voted; // if true, that person already voted
|
||||||
|
address delegate; // person delegated to
|
||||||
|
uint vote; // index of the voted proposal
|
||||||
|
} |
||||||
|
|
||||||
|
struct Proposal { |
||||||
|
// If you can limit the length to a certain number of bytes,
|
||||||
|
// always use one of bytes1 to bytes32 because they are much cheaper
|
||||||
|
bytes32 name; // short name (up to 32 bytes)
|
||||||
|
uint voteCount; // number of accumulated votes
|
||||||
|
} |
||||||
|
|
||||||
|
address public chairperson; |
||||||
|
|
||||||
|
mapping(address => Voter) public voters; |
||||||
|
|
||||||
|
Proposal[] public proposals; |
||||||
|
|
||||||
|
function () test { |
||||||
|
|
||||||
|
/** |
||||||
|
* @dev Create a new ballot to choose one of 'proposalNames'. |
||||||
|
* @param proposalNames names of proposals |
||||||
|
*/ |
||||||
|
constructor(bytes32[] memory proposalNames) { |
||||||
|
chairperson = msg.sender; |
||||||
|
voters[chairperson].weight = 1; |
||||||
|
|
||||||
|
for (uint i = 0; i < proposalNames.length; i++) { |
||||||
|
// 'Proposal({...})' creates a temporary
|
||||||
|
// Proposal object and 'proposals.push(...)'
|
||||||
|
// appends it to the end of 'proposals'.
|
||||||
|
proposals.push(Proposal({ |
||||||
|
name: proposalNames[i], |
||||||
|
voteCount: 0 |
||||||
|
})); |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @dev Give 'voter' the right to vote on this ballot. May only be called by 'chairperson'. |
||||||
|
* @param voter address of voter |
||||||
|
*/ |
||||||
|
function giveRightToVote(address voter) public { |
||||||
|
require( |
||||||
|
msg.sender == chairperson, |
||||||
|
"Only chairperson can give right to vote." |
||||||
|
); |
||||||
|
require( |
||||||
|
!voters[voter].voted, |
||||||
|
"The voter already voted." |
||||||
|
); |
||||||
|
require(voters[voter].weight == 0); |
||||||
|
voters[voter].weight = 1; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @dev Delegate your vote to the voter 'to'. |
||||||
|
* @param to address to which vote is delegated |
||||||
|
*/ |
||||||
|
function delegate(address to) public { |
||||||
|
Voter storage sender = voters[msg.sender]; |
||||||
|
require(!sender.voted, "You already voted."); |
||||||
|
require(to != msg.sender, "Self-delegation is disallowed."); |
||||||
|
|
||||||
|
while (voters[to].delegate != address(0)) { |
||||||
|
to = voters[to].delegate; |
||||||
|
|
||||||
|
// We found a loop in the delegation, not allowed.
|
||||||
|
require(to != msg.sender, "Found loop in delegation."); |
||||||
|
} |
||||||
|
sender.voted = true; |
||||||
|
sender.delegate = to; |
||||||
|
Voter storage delegate_ = voters[to]; |
||||||
|
if (delegate_.voted) { |
||||||
|
// If the delegate already voted,
|
||||||
|
// directly add to the number of votes
|
||||||
|
proposals[delegate_.vote].voteCount += sender.weight; |
||||||
|
} else { |
||||||
|
// If the delegate did not vote yet,
|
||||||
|
// add to her weight.
|
||||||
|
delegate_.weight += sender.weight; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @dev Give your vote (including votes delegated to you) to proposal 'proposals[proposal].name'. |
||||||
|
* @param proposal index of proposal in the proposals array |
||||||
|
*/ |
||||||
|
function vote(uint proposal) public { |
||||||
|
Voter storage sender = voters[msg.sender]; |
||||||
|
require(sender.weight != 0, "Has no right to vote"); |
||||||
|
require(!sender.voted, "Already voted."); |
||||||
|
sender.voted = true; |
||||||
|
sender.vote = proposal; |
||||||
|
|
||||||
|
// If 'proposal' is out of the range of the array,
|
||||||
|
// this will throw automatically and revert all
|
||||||
|
// changes.
|
||||||
|
proposals[proposal].voteCount += sender.weight; |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @dev Computes the winning proposal taking all previous votes into account. |
||||||
|
* @return winningProposal_ index of winning proposal in the proposals array |
||||||
|
*/ |
||||||
|
function winningProposal() public view |
||||||
|
returns (uint winningProposal_) |
||||||
|
{ |
||||||
|
uint winningVoteCount = 0; |
||||||
|
for (uint p = 0; p < proposals.length; p++) { |
||||||
|
if (proposals[p].voteCount > winningVoteCount) { |
||||||
|
winningVoteCount = proposals[p].voteCount; |
||||||
|
winningProposal_ = p; |
||||||
|
} |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
/** |
||||||
|
* @dev Calls winningProposal() function to get the index of the winner contained in the proposals array and then |
||||||
|
* @return winnerName_ the name of the winner |
||||||
|
*/ |
||||||
|
function winnerName() public view |
||||||
|
returns (bytes32 winnerName_) |
||||||
|
{ |
||||||
|
winnerName_ = proposals[winningProposal()].name; |
||||||
|
} |
||||||
|
} |
||||||
|
|
||||||
|
` |
||||||
Loading…
Reference in new issue