roll back decoupling of RefundVault in RefundableCrowdsale

contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol

@@ -11,25 +11,25 @@ import "../../math/SafeMath.sol";
 contract PostDeliveryCrowdsale is TimedCrowdsale {
   using SafeMath for uint256;
 
-  mapping(address => uint256) public promises;
+  mapping(address => uint256) public balances;
 
   /**
    * @dev Overrides parent by storing balances instead of issuing tokens right away.
    * @param _beneficiary Token purchaser
    * @param _tokenAmount Amount of tokens purchased
    */
   function _processPurchase(address _beneficiary, uint256 _tokenAmount) internal {
-    promises[_beneficiary] = promises[_beneficiary].add(_tokenAmount);
+    balances[_beneficiary] = balances[_beneficiary].add(_tokenAmount);
   }
 
   /**
    * @dev Withdraw tokens only after crowdsale ends.
    */
   function withdrawTokens() public {
     require(hasExpired());
-    uint256 amount = promises[msg.sender];
+    uint256 amount = balances[msg.sender];
     require(amount > 0);
-    promises[msg.sender] = 0;
+    balances[msg.sender] = 0;
     _emitTokens(msg.sender, amount);
   }
 }

contracts/crowdsale/distribution/RefundableCrowdsale.sol

@@ -23,13 +23,11 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
 
   /**
    * @param _goal Funding goal
-   * @param _vault Refund vault to temporarily store funds
    */
-  function RefundableCrowdsale(uint256 _goal, RefundVault _vault) public {
+  function RefundableCrowdsale(uint256 _goal) public {
     require(_goal > 0);
-    require(_vault != address(0));
+    vault = new RefundVault(wallet);
     goal = _goal;
-    vault = _vault;
   }
 
   /**

contracts/examples/SampleCrowdsale.sol

@@ -33,10 +33,10 @@ contract SampleCrowdsaleToken is MintableToken {
  */
 contract SampleCrowdsale is CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale {
 
-  function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet, uint256 _cap, MintableToken _token, uint256 _goal, RefundVault _vault) public
+  function SampleCrowdsale(uint256 _startTime, uint256 _endTime, uint256 _rate, address _wallet, uint256 _cap, MintableToken _token, uint256 _goal) public
     CappedCrowdsale(_cap)
     FinalizableCrowdsale()
-    RefundableCrowdsale(_goal, _vault)
+    RefundableCrowdsale(_goal)
     TimedCrowdsale(_startTime, _endTime)
     Crowdsale(_rate, _wallet, _token)
   {

contracts/mocks/RefundableCrowdsaleImpl.sol

@@ -12,12 +12,11 @@ contract RefundableCrowdsaleImpl is RefundableCrowdsale {
     uint256 _rate,
     address _wallet,
     MintableToken _token,
-    uint256 _goal,
-    RefundVault _vault
+    uint256 _goal
   ) public
     Crowdsale(_rate, _wallet, _token)
     TimedCrowdsale(_startTime, _endTime)
-    RefundableCrowdsale(_goal, _vault)
+    RefundableCrowdsale(_goal)
   {
   }
 

test/crowdsale/RefundableCrowdsale.test.js

@@ -32,18 +32,16 @@ contract('RefundableCrowdsale', function ([_, owner, wallet, investor, purchaser
     this.afterEndTime = this.endTime + duration.seconds(1);
 
     this.token = await SimpleToken.new();
-    this.vault = await RefundVault.new(wallet);
     this.crowdsale = await RefundableCrowdsale.new(
-      this.startTime, this.endTime, rate, wallet, this.token.address, goal, this.vault.address, { from: owner }
+      this.startTime, this.endTime, rate, wallet, this.token.address, goal, { from: owner }
     );
     await this.token.transfer(this.crowdsale.address, tokenSupply);
-    await this.vault.transferOwnership(this.crowdsale.address);
   });
 
   describe('creating a valid crowdsale', function () {
     it('should fail with zero goal', async function () {
       await RefundableCrowdsale.new(
-        this.startTime, this.endTime, rate, wallet, this.token.address, 0, this.vault.address, { from: owner }
+        this.startTime, this.endTime, rate, wallet, this.token.address, 0, { from: owner }
       ).should.be.rejectedWith(EVMRevert);
     });
   });

test/examples/SampleCrowdsale.test.js

@@ -33,7 +33,7 @@ contract('SampleCrowdsale', function ([owner, wallet, investor]) {
     this.token = await SampleCrowdsaleToken.new({ from: owner });
     this.vault = await RefundVault.new(wallet, { from: owner });
     this.crowdsale = await SampleCrowdsale.new(
-      this.startTime, this.endTime, RATE, wallet, CAP, this.token.address, GOAL, this.vault.address
+      this.startTime, this.endTime, RATE, wallet, CAP, this.token.address, GOAL
     );
     await this.token.transferOwnership(this.crowdsale.address);
     await this.vault.transferOwnership(this.crowdsale.address);