Fix test command: no MVM is created when funds are exactly the soft cap amount

Only when there is excess over the soft cap the MVM is created

Author: nberger

test/Crowdsale.js

@@ -1,5 +1,6 @@
 var LifCrowdsale = artifacts.require('./LifCrowdsale.sol'),
-  LifToken = artifacts.require('./LifToken.sol');
+  LifToken = artifacts.require('./LifToken.sol'),
+  LifMarketValidationMechanism = artifacts.require('./LifMarketValidationMechanism.sol');
 
 let help = require('./helpers');
 
@@ -400,4 +401,56 @@ contract('LifToken Crowdsale', function(accounts) {
     }
   });
 
+  /// finalize
+  it('finalize creates the MVM', 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 = 10000001 * weiPerUsd; // exactly USD 1 more than the minimum for the MVM
+
+    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 MVMAddress = await crowdsale.MVM.call();
+    assert(MVMAddress !== help.zeroAddress);
+
+    const MVM = LifMarketValidationMechanism.at(MVMAddress),
+      MVMInitialWei = await MVM.initialWei();
+    MVMInitialWei.should.be.bignumber.equal(1 * weiPerUsd);
+  });
+
+  it('finalize not over soft cap does not create the MVM', 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 = 10000000 * weiPerUsd; // exactly the soft cap
+
+    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 MVMAddress = await crowdsale.MVM.call();
+    assert(MVMAddress === help.zeroAddress, 'no MVM should have been created: ' + MVMAddress);
+  });
 });

test/CrowdsaleGenTest.js

@@ -749,6 +749,18 @@ contract('LifCrowdsale Property-based test', function(accounts) {
     });
   });
 
+  it('runs fine when funding over soft cap with no excess wei and finalize', async function() {
+    await runGeneratedCrowdsaleAndCommands({
+      commands: [
+        {'type':'fundCrowdsaleOverSoftCap','account':6,'softCapExcessWei':0,'finalize':true}
+      ],
+      crowdsale: {
+        rate1: 10, rate2: 23, foundationWallet: 4, foundersWallet: 10,
+        setWeiLockSeconds: 3405, owner: 5
+      }
+    });
+  });
+
   it('distributes tokens correctly on any combination of bids', async function() {
     // stateful prob based tests can take a long time to finish when shrinking...
     this.timeout(GEN_TESTS_TIMEOUT * 1000);

test/commands.js

@@ -646,7 +646,7 @@ async function runFundCrowdsaleBelowSoftCap(command, state) {
       // it might be that the funding was already over the soft cap, so let's check
       let softCap = await state.crowdsaleContract.maxFoundationCapUSD.call();
 
-      if (currentUSDFunding.gte(softCap)) {
+      if (currentUSDFunding.gt(softCap)) {
         assert(state.MVM);
         const capFor48Months = await state.crowdsaleContract.MVM24PeriodsCapUSD.call();
         if (currentUSDFunding.gte(capFor48Months)) {
@@ -679,6 +679,8 @@ async function runFundCrowdsaleOverSoftCap(command, state) {
 
     state = await startCrowdsaleAndBuyTokens(command.account, eth, weiPerUSD, state);
 
+    currentUSDFunding = state.weiRaised.div(weiPerUSD);
+
     if (command.finalize) {
       // wait for crowdsale end2Timestamp
       if (latestTime() < state.crowdsaleData.end2Timestamp) {
@@ -692,7 +694,7 @@ async function runFundCrowdsaleOverSoftCap(command, state) {
       assert.equal(true, state.crowdsaleFunded,
         'crowdwsale should be funded after fund over soft cap command');
 
-      if ((currentUSDFunding > softCap) || (command.softCapExcessWei > 0)) {
+      if (currentUSDFunding.gt(softCap)) {
         assert(state.MVM, 'there is MVM b/c funding is over the soft cap');
         assert.equal(24, parseInt(await state.MVM.totalPeriods()));
         assert.equal(state.crowdsaleData.foundationWallet, await state.MVM.foundationAddr());