remove totalPresaleWei variable, take presale wei in count for ICO

Author: AugustoL

contracts/LifCrowdsale.sol

@@ -82,9 +82,6 @@ contract LifCrowdsale is Ownable, Pausable {
   // Amount of lif minted and transferred during the TGE
   uint256 public tokensSold;
 
-  // Amount of wei received as private presale payments
-  uint256 public totalPresaleWei;
-
   // Address of the vesting schedule for the foundation created at the
   // end of the crowdsale
   VestedPayment public foundationVestedPayment;
@@ -257,7 +254,7 @@ contract LifCrowdsale is Ownable, Pausable {
 
     uint256 tokens = weiSent.mul(rate);
 
-    totalPresaleWei = totalPresaleWei.add(weiSent);
+    weiRaised = weiRaised.add(weiSent);
 
     token.mint(beneficiary, tokens);
 

test/CrowdsaleGenTest.js

@@ -39,14 +39,14 @@ contract('LifCrowdsale Property-based test', function (accounts) {
 
     let presaleWei = sumBigNumbers(_.map(state.presalePurchases, (p) => p.wei));
 
-    presaleWei.should.be.bignumber.equal(await crowdsale.totalPresaleWei.call());
-
     help.debug('checking purchases total wei, purchases:', JSON.stringify(state.purchases));
     let weiInPurchases = sumBigNumbers(_.map(state.purchases, (p) => p.wei));
-    weiInPurchases.should.be.bignumber.equal(await crowdsale.weiRaised());
+    if (state.crowdsaleFinalized)
+      new BigNumber(0).should.be.bignumber.equal(await web3.eth.getBalance(crowdsale.address));
+    else
+      weiInPurchases.should.be.bignumber.equal(await web3.eth.getBalance(crowdsale.address));
 
     // Check presale tokens sold
-    state.totalPresaleWei.should.be.bignumber.equal(await crowdsale.totalPresaleWei.call());
     assert.equal(state.crowdsaleFinalized, await crowdsale.isFinalized.call());
     if (state.crowdsaleFinalized && state.weiPerUSDinTGE > 0) {
       assert.equal(state.crowdsaleFunded, await crowdsale.funded());
@@ -179,7 +179,6 @@ contract('LifCrowdsale Property-based test', function (accounts) {
         presalePurchases: [],
         claimedEth: {},
         weiRaised: zero,
-        totalPresaleWei: zero,
         crowdsalePaused: false,
         tokenPaused: true,
         crowdsaleFinalized: false,

test/commands.js

@@ -375,7 +375,7 @@ async function runFinalizeCrowdsaleCommand (command, state) {
 async function runAddPrivatePresalePaymentCommand (command, state) {
   let { startTimestamp } = state.crowdsaleData,
     nextTimestamp = latestTime(),
-    weiToSend = web3.toWei(command.eth, 'ether'),
+    weiSent = web3.toWei(command.eth, 'ether'),
     account = gen.getAccount(command.fromAccount),
     beneficiary = gen.getAccount(command.beneficiaryAccount),
     hasZeroAddress = _.some([account, beneficiary], isZeroAddress);
@@ -385,20 +385,20 @@ async function runAddPrivatePresalePaymentCommand (command, state) {
     (account !== gen.getAccount(state.owner)) ||
     (state.crowdsaleFinalized) ||
     hasZeroAddress ||
-    (weiToSend === 0) ||
+    (weiSent === 0) ||
     (command.rate <= state.crowdsaleData.rate1);
 
   try {
     help.debug('Adding presale private tokens for account:', command.beneficiaryAccount, 'eth:', command.eth, 'fromAccount:', command.fromAccount, 'blockTimestamp:', nextTimestamp);
 
-    const tx = await state.crowdsaleContract.addPrivatePresaleTokens(beneficiary, weiToSend, command.rate, { from: account });
+    const tx = await state.crowdsaleContract.addPrivatePresaleTokens(beneficiary, weiSent, command.rate, { from: account });
 
     assert.equal(false, shouldThrow, 'buyTokens should have thrown but it did not');
 
-    state.totalSupply = state.totalSupply.plus(weiToSend * command.rate);
-    state.totalPresaleWei = state.totalPresaleWei.plus(weiToSend);
+    state.totalSupply = state.totalSupply.plus(weiSent * command.rate);
+    state.weiRaised = state.weiRaised.plus(weiSent);
     state.presalePurchases = _.concat(state.presalePurchases,
-      { rate: command.rate, wei: weiToSend, beneficiary: command.beneficiary, account: command.fromAccount }
+      { rate: command.rate, wei: weiSent, beneficiary: command.beneficiary, account: command.fromAccount }
     );
     state = decreaseEthBalance(state, command.fromAccount, help.txGasCost(tx));
   } catch (e) {