Merge pull request #289 from windingtree/increase-coverage-crowdsale-2

And more tests and increase coverage in LifCrowdsale

Author: nberger

contracts/LifMarketValidationMechanism.sol

@@ -138,17 +138,19 @@ contract LifMarketValidationMechanism is Ownable {
     // the 100% remaining can be claimed by the foundation. Values multipled by 10^5
 
     uint256[24] memory accumDistribution24 = [
-      uint256(0), 18, 117, 351, 767, 1407, 2309,3511, 5047, 6952, 9257
-      ,11995, 15196, 18889, 23104, 27870, 33215, 39166, 45749
-      ,52992, 60921, 69561, 78938, 89076
+      uint256(0), 18, 117, 351, 767, 1407,
+      2309, 3511, 5047, 6952, 9257, 11995,
+      15196, 18889, 23104, 27870, 33215, 39166,
+      45749, 52992, 60921, 69561, 78938, 89076
     ];
 
     uint256[48] memory accumDistribution48 = [
-      uint256(0), 3, 18, 54, 117, 214, 351, 534, 767, 1056, 1406, 1822
-      ,2308, 2869, 3510, 4234, 5046, 5950, 6950, 8051, 9256, 10569
-      ,11994, 13535, 15195, 16978, 18888, 20929, 23104, 25416, 27870
-      ,30468, 33214, 36112, 39165, 42376, 45749, 49286, 52992, 56869
-      ,60921, 65150, 69560, 74155, 78937, 83909, 89075, 94438
+      uint256(0), 3, 18, 54, 117, 214, 351, 534,
+      767, 1056, 1406, 1822, 2308, 2869, 3510, 4234,
+      5046, 5950, 6950, 8051, 9256, 10569, 11994, 13535,
+      15195, 16978, 18888, 20929, 23104, 25416, 27870, 30468,
+      33214, 36112, 39165, 42376, 45749, 49286, 52992, 56869,
+      60921, 65150, 69560, 74155, 78937, 83909, 89075, 94438
     ];
 
     for (uint8 i = 0; i < totalPeriods; i++) {

test/Crowdsale.js

@@ -3,6 +3,12 @@ var LifCrowdsale = artifacts.require('./LifCrowdsale.sol'),
 
 let help = require('./helpers');
 
+var BigNumber = web3.BigNumber;
+
+require('chai')
+  .use(require('chai-bignumber')(BigNumber))
+  .should();
+
 var latestTime = require('./helpers/latestTime');
 var {duration,increaseTimeTestRPCTo} = require('./helpers/increaseTime');
 
@@ -189,6 +195,17 @@ contract('LifToken Crowdsale', function(accounts) {
     }
   });
 
+  it('fails on buyTokens with rate==0 (before startTimestamp)', async function() {
+    const crowdsale = await createCrowdsale({});
+    await crowdsale.setWeiPerUSDinTGE(10000);
+    try {
+      await crowdsale.buyTokens(accounts[5], {value: 1000, from: accounts[5]});
+      assert(false, 'should have thrown');
+    } catch(e) {
+      assert(help.isInvalidOpcodeEx(e));
+    }
+  });
+
   /// addPrivatePresaleTokens
   it('handles an addPrivatePresaleTokens tx fine', async function() {
     const crowdsale = await createCrowdsale({}),
@@ -244,4 +261,143 @@ contract('LifToken Crowdsale', function(accounts) {
       assert(help.isInvalidOpcodeEx(e));
     }
   });
+
+  /// claimEth
+  it('claimEth succeeds after an underfunded finalized crowdsale', async function() {
+    const start = latestTime() + defaultTimeDelta,
+      end1 = start + defaultTimeDelta,
+      end2 = end1 + defaultTimeDelta,
+      beneficiary = accounts[6],
+      crowdsale = await createCrowdsale({
+        start: start,
+        end1: end1,
+        end2: end2
+      }),
+      weiPerUsd = 10000,
+      weiAmount = 5000000 * weiPerUsd - 1; // exactly USD 1 less than the funding limit
+
+    await crowdsale.setWeiPerUSDinTGE(weiPerUsd);
+    await increaseTimeTestRPCTo(start + 2);
+    await crowdsale.buyTokens(beneficiary, {value: weiAmount, from: accounts[5]});
+
+    await increaseTimeTestRPCTo(end2 + 2);
+    await crowdsale.finalize();
+
+    const balanceBeforeClaim = web3.eth.getBalance(beneficiary);
+
+    const tx = await crowdsale.claimEth({from: beneficiary});
+
+    balanceBeforeClaim.plus(weiAmount).minus(help.txGasCost(tx)).
+      should.be.bignumber.equal(web3.eth.getBalance(beneficiary));
+  });
+
+  it('claimEth fails after a funded finalized crowdsale', async function() {
+    const start = latestTime() + defaultTimeDelta,
+      end1 = start + defaultTimeDelta,
+      end2 = end1 + defaultTimeDelta,
+      crowdsale = await createCrowdsale({
+        start: start,
+        end1: end1,
+        end2: end2
+      }),
+      weiPerUsd = 10000,
+      weiAmount = 5000000 * weiPerUsd;
+    await crowdsale.setWeiPerUSDinTGE(weiPerUsd);
+    await increaseTimeTestRPCTo(start + 2);
+    await crowdsale.buyTokens(accounts[6], {value: weiAmount, from: accounts[5]});
+
+    await increaseTimeTestRPCTo(end2 + 2);
+    await crowdsale.finalize();
+
+    try {
+      await crowdsale.claimEth({from: accounts[6]});
+      assert(false, 'should have thrown');
+    } catch(e) {
+      assert(help.isInvalidOpcodeEx(e));
+    }
+  });
+
+  it('claimEth fails after an underfunded non-finalized (but ended) crowdsale ', async function() {
+    const start = latestTime() + defaultTimeDelta,
+      end1 = start + defaultTimeDelta,
+      end2 = end1 + defaultTimeDelta,
+      beneficiary = accounts[6],
+      crowdsale = await createCrowdsale({
+        start: start,
+        end1: end1,
+        end2: end2
+      }),
+      weiPerUsd = 10000,
+      weiAmount = 5000000 * weiPerUsd - 1;
+    await crowdsale.setWeiPerUSDinTGE(weiPerUsd);
+    await increaseTimeTestRPCTo(start + 2);
+    await crowdsale.buyTokens(beneficiary, {value: weiAmount, from: accounts[5]});
+
+    await increaseTimeTestRPCTo(end2 + 2);
+
+    try {
+      await crowdsale.claimEth({from: beneficiary});
+      assert(false, 'should have thrown');
+    } catch(e) {
+      assert(help.isInvalidOpcodeEx(e));
+    }
+  });
+
+  it('claimEth fails after an underfunded finalized crowdsale for an address with no purchases', async function() {
+    const start = latestTime() + defaultTimeDelta,
+      end1 = start + defaultTimeDelta,
+      end2 = end1 + defaultTimeDelta,
+      beneficiary = accounts[6],
+      crowdsale = await createCrowdsale({
+        start: start,
+        end1: end1,
+        end2: end2
+      }),
+      weiPerUsd = 10000,
+      weiAmount = 5000000 * weiPerUsd - 1; // exactly USD 1 less than the funding limit
+
+    await crowdsale.setWeiPerUSDinTGE(weiPerUsd);
+    await increaseTimeTestRPCTo(start + 2);
+    await crowdsale.buyTokens(beneficiary, {value: weiAmount, from: accounts[5]});
+
+    await increaseTimeTestRPCTo(end2 + 2);
+    await crowdsale.finalize();
+
+    try {
+      await crowdsale.claimEth({from: accounts[8]});
+      assert(false, 'should have thrown');
+    } catch(e) {
+      assert(help.isInvalidOpcodeEx(e));
+    }
+  });
+
+  /// finalize
+  it('finalize fails when called for the second time', async function() {
+    const start = latestTime() + defaultTimeDelta,
+      end1 = start + defaultTimeDelta,
+      end2 = end1 + defaultTimeDelta,
+      beneficiary = accounts[6],
+      crowdsale = await createCrowdsale({
+        start: start,
+        end1: end1,
+        end2: end2
+      }),
+      weiPerUsd = 10000,
+      weiAmount = 5000000 * weiPerUsd - 1; // exactly USD 1 less than the funding limit
+
+    await crowdsale.setWeiPerUSDinTGE(weiPerUsd);
+    await increaseTimeTestRPCTo(start + 2);
+    await crowdsale.buyTokens(beneficiary, {value: weiAmount, from: accounts[5]});
+
+    await increaseTimeTestRPCTo(end2 + 2);
+    await crowdsale.finalize();
+
+    try {
+      await crowdsale.finalize();
+      assert(false, 'should have thrown');
+    } catch(e) {
+      assert(help.isInvalidOpcodeEx(e));
+    }
+  });
+
 });