convert distribution crowdsales to initializers

contracts/crowdsale/distribution/FinalizableCrowdsale.sol

 pragma solidity ^0.4.24;
 
+import "../../Initializable.sol";
 import "../../math/SafeMath.sol";
 import "../validation/TimedCrowdsale.sol";
 
@@ -9,7 +10,7 @@ import "../validation/TimedCrowdsale.sol";
  * @dev Extension of Crowdsale with a one-off finalization action, where one
  * can do extra work after finishing.
  */
-contract FinalizableCrowdsale is TimedCrowdsale {
+contract FinalizableCrowdsale is Initializable, TimedCrowdsale {
   using SafeMath for uint256;
 
   bool private _finalized = false;

contracts/crowdsale/distribution/PostDeliveryCrowdsale.sol

 pragma solidity ^0.4.24;
 
+import "../../Initializable.sol";
 import "../validation/TimedCrowdsale.sol";
 import "../../token/ERC20/IERC20.sol";
 import "../../math/SafeMath.sol";
@@ -9,7 +10,7 @@ import "../../math/SafeMath.sol";
  * @title PostDeliveryCrowdsale
  * @dev Crowdsale that locks tokens from withdrawal until it ends.
  */
-contract PostDeliveryCrowdsale is TimedCrowdsale {
+contract PostDeliveryCrowdsale is Initializable, TimedCrowdsale {
   using SafeMath for uint256;
 
   mapping(address => uint256) private _balances;

contracts/crowdsale/distribution/RefundableCrowdsale.sol

 pragma solidity ^0.4.24;
 
 
+import "../../Initializable.sol";
 import "../../math/SafeMath.sol";
 import "./FinalizableCrowdsale.sol";
 import "../../payment/RefundEscrow.sol";
@@ -11,7 +12,7 @@ import "../../payment/RefundEscrow.sol";
  * @dev Extension of Crowdsale contract that adds a funding goal, and
  * the possibility of users getting a refund if goal is not met.
  */
-contract RefundableCrowdsale is FinalizableCrowdsale {
+contract RefundableCrowdsale is Initializable, FinalizableCrowdsale {
   using SafeMath for uint256;
 
   // minimum amount of funds to be raised in weis
@@ -20,11 +21,14 @@ contract RefundableCrowdsale is FinalizableCrowdsale {
   // refund escrow used to hold funds while crowdsale is running
   RefundEscrow private _escrow;
 
+  constructor(uint256 goal) public {
+  }
+
   /**
    * @dev Constructor, creates RefundEscrow.
    * @param goal Funding goal
    */
-  constructor(uint256 goal) public {
+  function initialize(uint256 goal) public initializer {
     require(goal > 0);
 
     // conditional added to make initializer idempotent in case of diamond inheritance

contracts/mocks/FinalizableCrowdsaleImpl.sol

 pragma solidity ^0.4.24;
 
+import "../Initializable.sol";
 import "../token/ERC20/IERC20.sol";
 import "../crowdsale/distribution/FinalizableCrowdsale.sol";
 
 
-contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
+contract FinalizableCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, FinalizableCrowdsale {
 
   constructor (
     uint256 openingTime,
@@ -17,6 +18,8 @@ contract FinalizableCrowdsaleImpl is FinalizableCrowdsale {
     Crowdsale(rate, wallet, token)
     TimedCrowdsale(openingTime, closingTime)
   {
+    Crowdsale.initialize(rate, wallet, token);
+    TimedCrowdsale.initialize(openingTime, closingTime);
   }
 
 }

contracts/mocks/PostDeliveryCrowdsaleImpl.sol

 pragma solidity ^0.4.24;
 
+import "../Initializable.sol";
 import "../token/ERC20/IERC20.sol";
 import "../crowdsale/distribution/PostDeliveryCrowdsale.sol";
 
 
-contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale {
+contract PostDeliveryCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, PostDeliveryCrowdsale {
 
   constructor (
     uint256 openingTime,
@@ -17,6 +18,8 @@ contract PostDeliveryCrowdsaleImpl is PostDeliveryCrowdsale {
     TimedCrowdsale(openingTime, closingTime)
     Crowdsale(rate, wallet, token)
   {
+    Crowdsale.initialize(rate, wallet, token);
+    TimedCrowdsale.initialize(openingTime, closingTime);
   }
 
 }

contracts/mocks/RefundableCrowdsaleImpl.sol

 pragma solidity ^0.4.24;
 
+import "../Initializable.sol";
 import "../token/ERC20/ERC20Mintable.sol";
 import "../crowdsale/distribution/RefundableCrowdsale.sol";
 
 
-contract RefundableCrowdsaleImpl is RefundableCrowdsale {
+contract RefundableCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, RefundableCrowdsale {
 
   constructor (
     uint256 openingTime,
@@ -19,6 +20,9 @@ contract RefundableCrowdsaleImpl is RefundableCrowdsale {
     TimedCrowdsale(openingTime, closingTime)
     RefundableCrowdsale(goal)
   {
+    Crowdsale.initialize(rate, wallet, token);
+    TimedCrowdsale.initialize(openingTime, closingTime);
+    RefundableCrowdsale.initialize(goal);
   }
 
 }

test/crowdsale/PostDeliveryCrowdsale.test.js

@@ -12,7 +12,7 @@ require('chai')
   .should();
 
 const PostDeliveryCrowdsale = artifacts.require('PostDeliveryCrowdsaleImpl');
-const SimpleToken = artifacts.require('SimpleToken');
+const SimpleToken = artifacts.require('SimpleTokenMock');
 
 contract('PostDeliveryCrowdsale', function ([_, investor, wallet, purchaser]) {
   const rate = new BigNumber(1);

test/crowdsale/RefundableCrowdsale.test.js

@@ -13,7 +13,7 @@ require('chai')
   .should();
 
 const RefundableCrowdsale = artifacts.require('RefundableCrowdsaleImpl');
-const SimpleToken = artifacts.require('SimpleToken');
+const SimpleToken = artifacts.require('SimpleTokenMock');
 
 contract('RefundableCrowdsale', function ([_, wallet, investor, purchaser, anyone]) {
   const rate = new BigNumber(1);