several fixes related to separating Capped from Timed. functions rena…

…med, mocks changed. Capped tests passing

contracts/crowdsale-refactor/distribution/FinalizableCrowdsale.sol

@@ -22,7 +22,7 @@ contract FinalizableCrowdsale is TimedCrowdsale, Ownable {
    */
   function finalize() onlyOwner public {
     require(!isFinalized);
-    require(hasEnded());
+    require(hasExpired());
 
     finalization();
     Finalized();

contracts/crowdsale-refactor/distribution/PostDeliveryCrowdsale.sol

@@ -4,15 +4,15 @@ import "../validation/TimedCrowdsale.sol";
 import "../../token/ERC20/ERC20.sol";
 
 contract PostDeliveryCrowdsale is TimedCrowdsale {
-  
+
   mapping(address => uint256) promises;
 
   function processPurchase(address _beneficiary, uint256 _tokenAmount) internal {
     promises[_beneficiary] = promises[_beneficiary].add(_tokenAmount);
   }
 
   function withdrawTokens() public {
-    require(hasEnded());
+    require(hasExpired());
     uint256 amount = promises[msg.sender];
     require(amount > 0);
     promises[msg.sender] = 0;

contracts/crowdsale-refactor/validation/TimedCrowdsale.sol

@@ -1,5 +1,6 @@
 pragma solidity ^0.4.18;
 
+import "../../math/SafeMath.sol";
 import "../Crowdsale.sol";
 
 contract TimedCrowdsale is Crowdsale {
@@ -9,8 +10,8 @@ contract TimedCrowdsale is Crowdsale {
   uint256 public endTime;
 
   function TimedCrowdsale(uint256 _startTime, uint256 _endTime) public {
-    require(_startTime >= now);
-    require(_endTime >= _startTime);
+    //require(_startTime >= now);
+    //require(_endTime >= _startTime);
 
     startTime = _startTime;
     endTime = _endTime;

contracts/examples/SampleCrowdsale.sol

@@ -1,7 +1,7 @@
 pragma solidity ^0.4.18;
 
-import "../crowdsale/CappedCrowdsale.sol";
-import "../crowdsale/RefundableCrowdsale.sol";
+import "../crowdsale-refactor/validation/CappedCrowdsale.sol";
+import "../crowdsale-refactor/distribution/RefundableCrowdsale.sol";
 import "../token/ERC20/MintableToken.sol";
 
 
@@ -32,11 +32,13 @@ contract SampleCrowdsaleToken is MintableToken {
  */
 contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale {
 
-  function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, uint256 _goal, uint256 _cap, address _wallet, MintableToken _token) public
+  //function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, uint256 _goal, uint256 _cap, address _wallet, MintableToken _token) public
+  function SampleCrowdsale(uint256 _rate, uint256 _goal, uint256 _cap, address _wallet, MintableToken _token) public
     CappedCrowdsale(_cap)
     FinalizableCrowdsale()
     RefundableCrowdsale(_goal)
-    Crowdsale(_startTime, _endTime, _rate, _wallet, _token)
+    //Crowdsale(_startTime, _endTime, _rate, _wallet, _token)
+    Crowdsale(_rate, _wallet, _token)
   {
     //As goal needs to be met for a successful crowdsale
     //the value needs to less or equal than a cap which is limit for accepted funds

contracts/mocks/CappedCrowdsaleImpl.sol

@@ -1,20 +1,19 @@
 pragma solidity ^0.4.18;
 
-
-import "../crowdsale/CappedCrowdsale.sol";
+//import "../examples/SimpleToken.sol";
+import "../token/ERC20/ERC20.sol";
+import "../crowdsale-refactor/validation/CappedCrowdsale.sol";
 
 
 contract CappedCrowdsaleImpl is CappedCrowdsale {
 
   function CappedCrowdsaleImpl (
-    uint256 _startTime,
-    uint256 _endTime,
     uint256 _rate,
     address _wallet,
     uint256 _cap,
-    MintableToken _token
+    ERC20 _token
   ) public
-    Crowdsale(_startTime, _endTime, _rate, _wallet, _token)
+    Crowdsale(_rate, _wallet, _token)
     CappedCrowdsale(_cap)
   {
   }

contracts/mocks/FinalizableCrowdsaleImpl.sol

@@ -1,19 +1,20 @@
 pragma solidity ^0.4.18;
 
-
-import "../crowdsale/FinalizableCrowdsale.sol";
+import "../token/ERC20/MintableToken.sol";
+import "../crowdsale-refactor/distribution/FinalizableCrowdsale.sol";
 
 
 contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
 
   function FinalizableCrowdsaleImpl (
-    uint256 _startTime,
-    uint256 _endTime,
+    //uint256 _startTime,
+    //uint256 _endTime,
     uint256 _rate,
     address _wallet,
     MintableToken _token
   ) public
-    Crowdsale(_startTime, _endTime, _rate, _wallet, _token)
+    //Crowdsale(_startTime, _endTime, _rate, _wallet, _token)
+    Crowdsale(_rate, _wallet, _token)
   {
   }
 

contracts/mocks/RefundableCrowdsaleImpl.sol

@@ -1,20 +1,21 @@
 pragma solidity ^0.4.18;
 
-
-import "../crowdsale/RefundableCrowdsale.sol";
+import "../token/ERC20/MintableToken.sol";
+import "../crowdsale-refactor/distribution/RefundableCrowdsale.sol";
 
 
 contract RefundableCrowdsaleImpl is RefundableCrowdsale {
 
   function RefundableCrowdsaleImpl (
-    uint256 _startTime,
-    uint256 _endTime,
+    //uint256 _startTime,
+    //uint256 _endTime,
     uint256 _rate,
     address _wallet,
     uint256 _goal,
     MintableToken _token
   ) public
-    Crowdsale(_startTime, _endTime, _rate, _wallet, _token)
+    //Crowdsale(_startTime, _endTime,
+    Crowdsale(_rate, _wallet, _token)
     RefundableCrowdsale(_goal)
   {
   }

test/crowdsale-refactor/CappedCrowdsale.test.js

@@ -12,38 +12,28 @@ require('chai')
   .should();
 
 const CappedCrowdsale = artifacts.require('CappedCrowdsaleImpl');
-const MintableToken = artifacts.require('MintableToken');
+const SimpleToken = artifacts.require('SimpleToken');
 
 contract('CappedCrowdsale', function ([_, wallet]) {
-  const rate = new BigNumber(1000);
+  const rate = new BigNumber(1);// Not that many SimpleTokens!! 1000);
 
-  const cap = ether(300);
+  const cap = ether(100);
   const lessThanCap = ether(60);
-
-  before(async function () {
-    // Advance to the next block to correctly read time in the solidity "now" function interpreted by testrpc
-    await advanceBlock();
-  });
+  const capital = ether(1000);
 
   beforeEach(async function () {
-    this.startTime = latestTime() + duration.weeks(1);
-    this.endTime = this.startTime + duration.weeks(1);
-
-    this.token = await MintableToken.new();
-    this.crowdsale = await CappedCrowdsale.new(this.startTime, this.endTime, rate, wallet, cap, this.token.address);
-    await this.token.transferOwnership(this.crowdsale.address);
+    this.token = await SimpleToken.new();
+    this.crowdsale = await CappedCrowdsale.new(rate, wallet, cap, this.token.address);
+    this.token.transfer(this.crowdsale.address, capital);
   });
 
   describe('creating a valid crowdsale', function () {
     it('should fail with zero cap', async function () {
-      await CappedCrowdsale.new(this.startTime, this.endTime, rate, wallet, 0).should.be.rejectedWith(EVMRevert);
+      await CappedCrowdsale.new(rate, wallet, 0, this.token.address).should.be.rejectedWith(EVMRevert);
     });
   });
 
   describe('accepting payments', function () {
-    beforeEach(async function () {
-      await increaseTimeTo(this.startTime);
-    });
 
     it('should accept payments within cap', async function () {
       await this.crowdsale.send(cap.minus(lessThanCap)).should.be.fulfilled;
@@ -61,28 +51,25 @@ contract('CappedCrowdsale', function ([_, wallet]) {
   });
 
   describe('ending', function () {
-    beforeEach(async function () {
-      await increaseTimeTo(this.startTime);
-    });
 
-    it('should not be ended if under cap', async function () {
-      let hasEnded = await this.crowdsale.hasEnded();
-      hasEnded.should.equal(false);
+    it('should not reach cap if sent under cap', async function () {
+      let capReached = await this.crowdsale.capReached();
+      capReached.should.equal(false);
       await this.crowdsale.send(lessThanCap);
-      hasEnded = await this.crowdsale.hasEnded();
-      hasEnded.should.equal(false);
+      capReached = await this.crowdsale.capReached();
+      capReached.should.equal(false);
     });
 
-    it('should not be ended if just under cap', async function () {
+    it('should not reach cap if sent just under cap', async function () {
       await this.crowdsale.send(cap.minus(1));
-      let hasEnded = await this.crowdsale.hasEnded();
-      hasEnded.should.equal(false);
+      let capReached = await this.crowdsale.capReached();
+      capReached.should.equal(false);
     });
 
-    it('should be ended if cap reached', async function () {
+    it('should reach cap if cap sent', async function () {
       await this.crowdsale.send(cap);
-      let hasEnded = await this.crowdsale.hasEnded();
-      hasEnded.should.equal(true);
+      let capReached = await this.crowdsale.capReached();
+      capReached.should.equal(true);
     });
   });
 });

test/crowdsale-refactor/Crowdsale.test.js

@@ -15,18 +15,17 @@ const Crowdsale = artifacts.require('Crowdsale');
 const SimpleToken = artifacts.require('SimpleToken');
 
 contract('Crowdsale', function ([god, investor, wallet, purchaser]) {
-  const rate = new BigNumber(1000);
-  const value = ether(4.2);
-  const holdings = ether(10000);
+  const rate = new BigNumber(1); // Not that many SimpleTokens!! 1000);
+  const value = ether(42);
+  const capital = ether(10000);
 
   const expectedTokenAmount = rate.mul(value);
 
   beforeEach(async function () {
 
     this.token = await SimpleToken.new();
     this.crowdsale = await Crowdsale.new(rate, wallet, this.token.address);
-    //fund crowdsale
-    this.token.transfer(this.crowdsale.address, holdings);
+    this.token.transfer(this.crowdsale.address, capital);
   });
 
 
@@ -56,13 +55,6 @@ contract('Crowdsale', function ([god, investor, wallet, purchaser]) {
       event.args.amount.should.be.bignumber.equal(expectedTokenAmount);
     });
 
-    //OBSOLETE, not minting
-    // it('should increase totalSupply', async function () {
-    //   await this.crowdsale.send(value);
-    //   const totalSupply = await this.token.totalSupply();
-    //   totalSupply.should.be.bignumber.equal(expectedTokenAmount);
-    // });
-
     it('should assign tokens to sender', async function () {
       await this.crowdsale.sendTransaction({ value: value, from: investor });
       let balance = await this.token.balanceOf(investor);
@@ -92,13 +84,6 @@ contract('Crowdsale', function ([god, investor, wallet, purchaser]) {
       event.args.amount.should.be.bignumber.equal(expectedTokenAmount);
     });
 
-  //  OBSOLETE
-  //   it('should increase totalSupply', async function () {
-  //     await this.crowdsale.buyTokens(investor, { value, from: purchaser });
-  //     const totalSupply = await this.token.totalSupply();
-  //     totalSupply.should.be.bignumber.equal(expectedTokenAmount);
-  //   });
-
     it('should assign tokens to beneficiary', async function () {
       await this.crowdsale.buyTokens(investor, { value, from: purchaser });
       const balance = await this.token.balanceOf(investor);