passing at constructor the firstDayCap && updated tests

Author: tiero

contracts/foundation/AgiCrowdsale.sol

@@ -19,8 +19,7 @@ contract AgiCrowdsale is Ownable, ReentrancyGuard {
 
     // We have a window in the first 24hrs that permits to allocate all whitelist 
     // participants with an equal distribution => firstDayCap = cap / whitelist participants.
-
-    uint256 public firstDayCap = 5 * 10**uint256(18);
+    uint256 public firstDayCap;
     uint256 public cap;
     uint256 public goal;
     uint256 public rate;
@@ -54,6 +53,7 @@ contract AgiCrowdsale is Ownable, ReentrancyGuard {
         uint256 _endTime,
         uint256 _rate,
         uint256 _cap,
+        uint256 _firstDayCap,
         uint256 _goal
     ) {
         require(_startTime >= getBlockTimestamp());
@@ -69,6 +69,7 @@ contract AgiCrowdsale is Ownable, ReentrancyGuard {
         startTime = _startTime;
         endTime = _endTime;
         firstDay = startTime + 1 * 1 days;
+        firstDayCap = _firstDayCap;
         rate = _rate;
         goal = _goal;
         cap = _cap;
@@ -143,14 +144,15 @@ contract AgiCrowdsale is Ownable, ReentrancyGuard {
         }
     }
 
-    // add to whitelist array of addresses
+    // add/remove to whitelist array of addresses based on boolean status
     function updateWhitelist(address[] addresses, bool status) public onlyOwner {
         for (uint256 i = 0; i < addresses.length; i++) {
             address contributorAddress = addresses[i];
             whitelist[contributorAddress] = status;
         }
     }
 
+    //Only owner can manually finalize the sale
     function finalize() onlyOwner {
         require(!isFinalized);
         require(hasEnded());

migrations/3_deploy_crowdsale_contract.js

@@ -3,7 +3,7 @@ const AgiCrowdsale = artifacts.require("foundation/AgiCrowdsale.sol")
 const SingularityNetToken = artifacts.require("token/SingularityNetToken.sol")
 
 function latestTime() {
-  return web3.eth.getBlock('latest').timestamp;
+  return web3.eth.getBlock('latest').timestamp
 }
 
 const duration = {
@@ -16,12 +16,13 @@ const duration = {
 }
 
 module.exports = function(deployer, network, accounts) {
-  const startTime = latestTime() + duration.minutes(5);
-  const endTime = startTime + duration.days(20);
-  const rate = new web3.BigNumber(1000);
-  const wallet = web3.eth.accounts[0];
-  const goal = new web3.BigNumber(3000 * Math.pow(10, 18));
-  const cap = new web3.BigNumber(15000 * Math.pow(10, 18));
+  const startTime = latestTime() + duration.minutes(5)
+  const endTime = startTime + duration.days(20)
+  const rate = new web3.BigNumber(1000)
+  const wallet = web3.eth.accounts[0]
+  const goal = new web3.BigNumber(3000 * Math.pow(10, 18))
+  const cap = new web3.BigNumber(15000 * Math.pow(10, 18))
+  const firstDayCap = new web3.BigNumber(5 * Math.pow(10, 18))
 
   deployer.deploy(
     AgiCrowdsale,
@@ -31,6 +32,7 @@ module.exports = function(deployer, network, accounts) {
     endTime,
     rate,
     cap,
+    firstDayCap,
     goal
   ).then(() => {
     const fileName = "addresses.json"

test/TestAgiCrowdsale.js

@@ -21,7 +21,8 @@ contract('AgiCrowdsale', async ([miner, firstContributor, secondContributor, whi
     const rate = new web3.BigNumber(1000)
     const goal = new web3.BigNumber(3 * Math.pow(10, 18))
     const cap = new web3.BigNumber(15 * Math.pow(10, 18))
-    agiCrowdsale = await Crowdsale.new(token.address, wallet, startTime, endTime, rate, cap, goal, { from: miner })
+    const firstDayCap = new web3.BigNumber(5 * Math.pow(10, 18))
+    agiCrowdsale = await Crowdsale.new(token.address, wallet, startTime, endTime, rate, cap, firstDayCap, goal, { from: miner })
     await agiCrowdsale.setBlockTimestamp(startTime + duration.days(2))
   })
 

test/TestSingularityNetToken.js

@@ -1,7 +1,7 @@
 const SingularityNetToken = artifacts.require('./helpers/SingularityNetTokenMock.sol')
 const Crowdsale = artifacts.require('./helpers/AgiCrowdsaleMock.sol')
 
-
+const assertFail = require('./helpers/assertFail.js')
 const { latestTime, duration } = require('./helpers/latestTime')
 
 contract('SingularityNetToken', (accounts) => {
@@ -46,7 +46,8 @@ contract('SingularityNetToken', (accounts) => {
     const rate = new web3.BigNumber(1000)
     const goal = new web3.BigNumber(3000 * Math.pow(10, 18))
     const cap = new web3.BigNumber(15000 * Math.pow(10, 18))
-    agiCrowdsale = await Crowdsale.new(token.address, accounts[2], startTime, endTime, rate, cap, goal)
+    const firstDayCap = new web3.BigNumber(5000 * Math.pow(10, 18))
+    agiCrowdsale = await Crowdsale.new(token.address, accounts[2], startTime, endTime, rate, cap, firstDayCap, goal)
     await agiCrowdsale.setBlockTimestamp(startTime + duration.days(1))
 
     //should be the new owner and start the sale
@@ -100,21 +101,16 @@ contract('SingularityNetToken', (accounts) => {
     const rate = new web3.BigNumber(1000)
     const goal = new web3.BigNumber(3000 * Math.pow(10, 18))
     const cap = new web3.BigNumber(15000 * Math.pow(10, 18))
-    agiCrowdsale = await Crowdsale.new(token.address, accounts[2], startTime, endTime, rate, cap, goal)
+    const firstDayCap = new web3.BigNumber(5 * Math.pow(10, 18))
+    
+    agiCrowdsale = await Crowdsale.new(token.address, accounts[2], startTime, endTime, rate, cap, firstDayCap, goal)
     await agiCrowdsale.setBlockTimestamp(startTime + duration.days(1))
 
     // First time should be ok
     await token.setOwnership(agiCrowdsale.address)
 
     // Callisg anthoer time, not
-    try {
-      await token.setOwnership(agiCrowdsale.address)
-
-      assert.fail('should have thrown before')
-    } catch (error) {
-      assert.ok(error.message.search('invalid opcode'), 'Invalid opcode error must be returned');
-    }
-
+    await assertFail(async () => await token.setOwnership(agiCrowdsale.address), 'should have thrown before')
   })
 
   it('should transfer tokens to someone if owner', async function () {

test/helpers/AgiCrowdsaleMock.sol

@@ -18,9 +18,10 @@ contract AgiCrowdsaleMock is AgiCrowdsale {
         uint256 _startTime, 
         uint256 _endTime, 
         uint256 _rate, 
-        uint256 _cap, 
+        uint256 _cap,
+        uint256 _firstDayCap, 
         uint256 _goal) 
-        AgiCrowdsale(_token, _wallet, _startTime, _endTime, _rate, _cap, _goal)
+        AgiCrowdsale(_token, _wallet, _startTime, _endTime, _rate, _cap, _firstDayCap, _goal)
     {
     }