chore: run linters

Author: valentinpollart

contracts/Ballot.sol

@@ -7,36 +7,6 @@ import "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import "@openzeppelin/contracts/proxy/utils/Initializable.sol";
 import "./VotingProxy.sol";
 
-// Can a voter change his/her vote ? --> Yes
-// Can a voter who grant proxy to somebody can still vote ? --> No
-// Can s.he change proxy voter vote ? -->
-// Can a proxy voter change original voter vote ?
-// Is there a limit of delegate votes per proxy voters ?
-// Can a voter grant proxy to more than one person on a given tag ?
-// Do we need to have a started flag so admins can create a vote and start it afterwards ? --> No
-
-// Can a voter delegate to a voter that has less than 25k DPS ? --> No
-// Is the 25k DPS limit for delegating balance DPS or undelegated DPS ? --> DPS balance
-
-// If A grant proxy to B, and if A and B call vote and reach the vote verification simultaneously, both A and B might register a vote for A
-// ==> Could be solved by registering voters address instead of incrementing a count, but scales badly.
-
-// Currently, order is not kept for tags, causing index issues, 2 solutions :
-//  - remove reference to tag index and use value => forces to check each time there's a reference to a tag to verify it is a member of tag list.
-//  - do not change indexes at tag removal => residual value (such as empty string) will be left in the tag list.
-// ==> Should owner even be able to remove a tag ?
-
-// Is granting recursive (if A grants proxy to B and B to C, does C has voting power of B+C or A+B+C ?)
-
-// Add/remove choices ?
-
-// A a voté 1
-// B a voté 2
-
-// voters = address[]
-// mapping(address => uint32) results
-// results[C] == 0
-
 contract Ballot is Ownable, Initializable {
     IERC20Metadata public immutable DPS;
     VotingProxy public proxy;
@@ -81,12 +51,12 @@ contract Ballot is Ownable, Initializable {
     }
 
     function vote(uint32 choiceIndex) external {
-        require(!closed, 'Voting: Ballot is closed.');
-        require(choices.length > choiceIndex, 'Voting: Choice index is too high.');
+        require(!closed, "Voting: Ballot is closed.");
+        require(choices.length > choiceIndex, "Voting: Choice index is too high.");
 
-        require(!proxy.hasDelegated(msg.sender,tagIndex), 'Voting: Vote is delegated.'); // Verify that voter has not granted proxy to somebody.
+        require(!proxy.hasDelegated(msg.sender,tagIndex), "Voting: Vote is delegated."); // Verify that voter has not granted proxy to somebody.
 
-        require(DPS.balanceOf(msg.sender) >= 25e3 * 1e18, 'Voting: Not enough DPS to vote.'); // 25k DPS limit
+        require(DPS.balanceOf(msg.sender) >= 25e3 * 1e18, "Voting: Not enough DPS to vote."); // 25k DPS limit
 
         if(!votes[msg.sender].hasVoted) {
             votes[msg.sender].hasVoted = true;
@@ -97,7 +67,7 @@ contract Ballot is Ownable, Initializable {
     }
 
     function closeBallot() external onlyOwner {
-        require(!closed, 'Voting: Ballot already closed.');
+        require(!closed, "Voting: Ballot already closed.");
 
         closed = true;
 

contracts/VotingProxy.sol

@@ -22,15 +22,15 @@ contract VotingProxy is Ownable {
 
     constructor(IERC20Metadata _DPS, BallotTagManager _ballotTagManager) {
         require(address(_DPS) != address(0), "VotingProxy: DPS address is zero.");
-        require(address(_ballotTagManager) != address(0), 'VotingProxy: Ballot tag manager address is zero.');
+        require(address(_ballotTagManager) != address(0), "VotingProxy: Ballot tag manager address is zero.");
 
         DPS = _DPS;
         ballotTagManager = _ballotTagManager;
     }
 
     function grantProxy(address to, uint32 tagIndex) external {
-        require(ballotTagManager.getTags().length > tagIndex, 'VotingProxy: Tag index is too high');
-        require(DPS.balanceOf(to) >= 25e3 * 1e18 || to == address(0), 'VotingProxy: Proxy has not enough DPS.');
+        require(ballotTagManager.getTags().length > tagIndex, "VotingProxy: Tag index is too high");
+        require(DPS.balanceOf(to) >= 25e3 * 1e18 || to == address(0), "VotingProxy: Proxy has not enough DPS.");
 
         if(proxyVoters[msg.sender][tagIndex] != address(0)) {
             Grants storage formerDelegateGrants = delegates[proxyVoters[msg.sender][tagIndex]][tagIndex];
@@ -52,7 +52,7 @@ contract VotingProxy is Ownable {
     }
 
     function proxyAmount(address voter, uint32 tagIndex) public view returns (uint256) {
-        require(ballotTagManager.getTags().length > tagIndex, 'VotingProxy: Tag index is too high');
+        require(ballotTagManager.getTags().length > tagIndex, "VotingProxy: Tag index is too high");
         uint256 total;
         for(uint32 i = 0; i < delegates[voter][tagIndex].grantCount; i++) {
             total += DPS.balanceOf(delegates[voter][tagIndex].indexVoter[i]);

contracts/factories/BallotFactory.sol

@@ -16,14 +16,14 @@ contract BallotFactory is Ownable {
     event BallotCreated(address ballotAddress);
 
     constructor(address _implementationAddress, BallotTagManager _ballotTagManager){
-        require(_implementationAddress != address(0), 'BallotFactory: Implementation address should not be zero address');
-        require(address(_ballotTagManager) != address(0), 'BallotFactory: Ballot tag manager address should not be zero address');
+        require(_implementationAddress != address(0), "BallotFactory: Implementation address should not be zero address");
+        require(address(_ballotTagManager) != address(0), "BallotFactory: Ballot tag manager address should not be zero address");
         implementationAddress = _implementationAddress;
         ballotTagManager = _ballotTagManager;
     }
 
     function createBallot(string memory subject, uint32 tagIndex, string[] memory _choices) external onlyOwner {
-        require(ballotTagManager.getTags().length > tagIndex, 'BallotFactory: Tag index is too high.');
+        require(ballotTagManager.getTags().length > tagIndex, "BallotFactory: Tag index is too high.");
 
         address cloneAddress = Clones.clone(implementationAddress);
         Ballot(cloneAddress).init(subject, tagIndex, _choices);
@@ -33,7 +33,7 @@ contract BallotFactory is Ownable {
     }
 
     function setImplementationAddress(address newAddress) external onlyOwner {
-        require(newAddress != address(0), 'BallotFactory: Implementation address should not be zero address');
+        require(newAddress != address(0), "BallotFactory: Implementation address should not be zero address");
         implementationAddress = newAddress;
     }
 

test/Ballot.spec.ts

@@ -3,13 +3,7 @@ import { BigNumber } from '@ethersproject/bignumber';
 import { parseUnits } from '@ethersproject/units';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { ZERO_ADDRESS } from '../lib/constants';
-import {
-  BallotTagManager,
-  DeepSquare,
-  ExposedBallot,
-  ExposedBallot__factory,
-  ExposedVotingProxy,
-} from '../typings';
+import { BallotTagManager, DeepSquare, ExposedBallot, ExposedBallot__factory, ExposedVotingProxy } from '../typings';
 import { ERC20Agent } from './testing/ERC20Agent';
 import setup from './testing/setup';
 import setupVoting from './testing/setupVoting';

test/BallotFactory.spec.ts

@@ -1,14 +1,7 @@
 import { expect } from 'chai';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { ZERO_ADDRESS } from '../lib/constants';
-import {
-  Ballot,
-  BallotFactory,
-  BallotFactory__factory,
-  BallotTagManager,
-  DeepSquare,
-  VotingProxy,
-} from '../typings';
+import { Ballot, BallotFactory, BallotFactory__factory, BallotTagManager, DeepSquare, VotingProxy } from '../typings';
 import setup from './testing/setup';
 import setupVoting from './testing/setupVoting';
 

test/BallotTagManager.spec.ts

@@ -20,4 +20,4 @@ describe('BallotTagManager', () => {
       expect(await ballotTagManager.getTags()).to.deep.equals(['foo', 'bar']);
     });
   });
-});
+});

test/DeepSquare.spec.ts

@@ -1,8 +1,7 @@
 import { expect } from 'chai';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { DPS_TOTAL_SUPPLY } from '../lib/constants';
-import waitTx from '../lib/waitTx';
-import { DeepSquare } from '../typings/contracts/DeepSquare';
+import { DeepSquare } from '../typings';
 import { ERC20Agent } from './testing/ERC20Agent';
 import { randomInt } from './testing/random';
 import setup from './testing/setup';

test/VotingProxy.spec.ts

@@ -3,13 +3,7 @@ import { BigNumber } from '@ethersproject/bignumber';
 import { parseUnits } from '@ethersproject/units';
 import { SignerWithAddress } from '@nomiclabs/hardhat-ethers/signers';
 import { ZERO_ADDRESS } from '../lib/constants';
-import {
-  BallotFactory,
-  BallotTagManager,
-  DeepSquare,
-  ExposedVotingProxy,
-  ExposedVotingProxy__factory,
-} from '../typings';
+import { BallotTagManager, DeepSquare, ExposedVotingProxy, ExposedVotingProxy__factory } from '../typings';
 import { ERC20Agent } from './testing/ERC20Agent';
 import setup from './testing/setup';
 import setupVoting from './testing/setupVoting';
@@ -21,11 +15,10 @@ describe('Voting proxy', async () => {
   let agentDPS: ERC20Agent;
   let ballotTagManager: BallotTagManager;
   let votingProxy: ExposedVotingProxy;
-  let ballotFactory: BallotFactory;
 
   beforeEach(async () => {
     ({ owner, accounts, DPS, agentDPS } = await setup());
-    ({ ballotTagManager, votingProxy, ballotFactory } = await setupVoting(owner, DPS));
+    ({ ballotTagManager, votingProxy } = await setupVoting(owner, DPS));
   });
 
   describe('constructor', () => {