status-im/snt-voting
2
0
Fork 0
mirror of https://github.com/status-im/snt-voting.git synced 2025-02-23 23:58:13 +00:00
Code Issues Projects Releases Wiki Activity

Randomizing ballots #12

Browse Source
This commit is contained in:
Richard Ramos 2018-10-27 07:41:13 -04:00
parent f261364d31
commit 5684f28119
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/components/flow/PollVoting.js
View File

@ -35,11 +35,19 @@ const arraysEqual = (arr1, arr2) => {
return true;
}
const shuffleArray = (array) => {
for (let i = array.length - 1; i > 0; i--) {
const j = Math.floor(Math.random() * (i + 1));
[array[i], array[j]] = [array[j], array[i]]; // eslint-disable-line no-param-reassign
}
}
class PollVoting extends Component {
state = {
votes: [],
originalVotes: [],
voteOrder: [],
t: new Date()
}
@ -54,13 +62,18 @@ class PollVoting extends Component {
const poll = polls[idPoll];
const votes = [];
const voteOrder = [];
if(originalVotes.length){
for(let i = 0; i < poll._numBallots; i++){
votes[i] = originalVotes[i];
voteOrder.push(i);
}
}
shuffleArray(voteOrder);
this.setState({
voteOrder,
originalVotes,
votes
});
@ -79,7 +92,7 @@ class PollVoting extends Component {
render(){
const {polls, classes, balances, idPoll, back} = this.props;
const {originalVotes, votes} = this.state;
const {originalVotes, votes, voteOrder} = this.state;
const {fromWei} = web3.utils;
if(!polls || !polls.length){
@ -121,9 +134,9 @@ class PollVoting extends Component {
return <Fragment>
<div className="section">
<Typography variant="headline">{title}</Typography>
{ votes.map((v, i) => {
const item = ballots[i];
return <BallotSlider key={i} title={item.title} subtitle={item.subtitle} symbol={symbol} classes={classes} votes={v} cantVote={cantVote} balance={balance} maxVotes={maxVotes} maxVotesAvailable={maxValuesForBallots[i]} updateVotes={this.updateVotes(i)} />
{ voteOrder.map((v, i) => {
const item = ballots[v];
return <BallotSlider key={i} title={item.title} subtitle={item.subtitle} symbol={symbol} classes={classes} votes={votes[v]} cantVote={cantVote} balance={balance} maxVotes={maxVotes} maxVotesAvailable={maxValuesForBallots[v]} updateVotes={this.updateVotes(v)} />
})}
</div>

3
app/components/flow/ReviewVotes.js
View File

@ -6,6 +6,7 @@ import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
import PollManager from 'Embark/contracts/PollManager';
import { withRouter } from 'react-router-dom'
class ReviewVotes extends Component {
state = {
@ -27,7 +28,7 @@ class ReviewVotes extends Component {
const balance4Voting = ballots.reduce((prev, curr) => prev.add(curr), toBN("0"));
const toSend = balance4Voting == 0 ? unvote(idPoll) : vote(idPoll, ballots);
const toSend = balance4Voting == 0 ? unvote(idPoll) : vote(idPoll, ballots.map(x => x.toString()));
toSend.estimateGas()
.then(gasEstimated => {