From 621d4b30da8d12e4ba64349d4ddff80babb61d5f Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Fri, 28 Sep 2018 17:51:59 -0300 Subject: [PATCH] remove constructors from Crowdsales --- contracts/crowdsale/Crowdsale.sol | 3 --- .../distribution/RefundableCrowdsale.sol | 3 --- .../crowdsale/emission/AllowanceCrowdsale.sol | 3 --- .../price/IncreasingPriceCrowdsale.sol | 3 --- .../crowdsale/validation/CappedCrowdsale.sol | 3 --- .../crowdsale/validation/TimedCrowdsale.sol | 3 --- contracts/examples/SampleCrowdsale.sol | 17 ----------------- contracts/mocks/AllowanceCrowdsaleImpl.sol | 2 -- contracts/mocks/CappedCrowdsaleImpl.sol | 2 -- contracts/mocks/CrowdsaleMock.sol | 2 +- contracts/mocks/FinalizableCrowdsaleImpl.sol | 2 -- .../mocks/IncreasingPriceCrowdsaleImpl.sol | 3 --- .../mocks/IndividuallyCappedCrowdsaleImpl.sol | 1 - contracts/mocks/MintedCrowdsaleImpl.sol | 1 - contracts/mocks/PostDeliveryCrowdsaleImpl.sol | 2 -- contracts/mocks/RefundableCrowdsaleImpl.sol | 3 --- contracts/mocks/SampleCrowdsaleMock.sol | 1 - contracts/mocks/TimedCrowdsaleImpl.sol | 2 -- 18 files changed, 1 insertion(+), 55 deletions(-) diff --git a/contracts/crowdsale/Crowdsale.sol b/contracts/crowdsale/Crowdsale.sol index 1da87b1c7..76d9e4c22 100644 --- a/contracts/crowdsale/Crowdsale.sol +++ b/contracts/crowdsale/Crowdsale.sol @@ -51,9 +51,6 @@ contract Crowdsale is Initializable { uint256 amount ); - constructor(uint256 rate, address wallet, IERC20 token) public { - } - /** * @param rate Number of token units a buyer gets per wei * @dev The rate is the conversion between wei and the smallest and indivisible diff --git a/contracts/crowdsale/distribution/RefundableCrowdsale.sol b/contracts/crowdsale/distribution/RefundableCrowdsale.sol index 5c3ec06a2..b9d2ed75e 100644 --- a/contracts/crowdsale/distribution/RefundableCrowdsale.sol +++ b/contracts/crowdsale/distribution/RefundableCrowdsale.sol @@ -21,9 +21,6 @@ contract RefundableCrowdsale is Initializable, 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 diff --git a/contracts/crowdsale/emission/AllowanceCrowdsale.sol b/contracts/crowdsale/emission/AllowanceCrowdsale.sol index d2caad7ef..abe9604f7 100644 --- a/contracts/crowdsale/emission/AllowanceCrowdsale.sol +++ b/contracts/crowdsale/emission/AllowanceCrowdsale.sol @@ -17,9 +17,6 @@ contract AllowanceCrowdsale is Initializable, Crowdsale { address private _tokenWallet; - constructor(address tokenWallet) public { - } - /** * @dev Constructor, takes token wallet address. * @param tokenWallet Address holding the tokens, which has approved allowance to the crowdsale diff --git a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol index dda440107..119f47d02 100644 --- a/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol +++ b/contracts/crowdsale/price/IncreasingPriceCrowdsale.sol @@ -17,9 +17,6 @@ contract IncreasingPriceCrowdsale is Initializable, TimedCrowdsale { uint256 private _initialRate; uint256 private _finalRate; - constructor(uint256 initialRate, uint256 finalRate) public { - } - /** * @dev Constructor, takes initial and final rates of tokens received per wei contributed. * @param initialRate Number of tokens a buyer gets per wei at the start of the crowdsale diff --git a/contracts/crowdsale/validation/CappedCrowdsale.sol b/contracts/crowdsale/validation/CappedCrowdsale.sol index 2d24077a6..0e6f4edfb 100644 --- a/contracts/crowdsale/validation/CappedCrowdsale.sol +++ b/contracts/crowdsale/validation/CappedCrowdsale.sol @@ -14,9 +14,6 @@ contract CappedCrowdsale is Initializable, Crowdsale { uint256 private _cap; - constructor(uint256 cap) public { - } - /** * @dev Constructor, takes maximum amount of wei accepted in the crowdsale. * @param cap Max amount of wei to be contributed diff --git a/contracts/crowdsale/validation/TimedCrowdsale.sol b/contracts/crowdsale/validation/TimedCrowdsale.sol index c73a3bb3a..7e1012d35 100644 --- a/contracts/crowdsale/validation/TimedCrowdsale.sol +++ b/contracts/crowdsale/validation/TimedCrowdsale.sol @@ -23,9 +23,6 @@ contract TimedCrowdsale is Initializable, Crowdsale { _; } - constructor(uint256 openingTime, uint256 closingTime) public { - } - /** * @dev Constructor, takes crowdsale opening and closing times. * @param openingTime Crowdsale opening time diff --git a/contracts/examples/SampleCrowdsale.sol b/contracts/examples/SampleCrowdsale.sol index 407967af5..aadd1c1ea 100644 --- a/contracts/examples/SampleCrowdsale.sol +++ b/contracts/examples/SampleCrowdsale.sol @@ -46,23 +46,6 @@ contract SampleCrowdsaleToken is Initializable, ERC20Mintable { // solium-disable-next-line max-len contract SampleCrowdsale is Initializable, Crowdsale, CappedCrowdsale, RefundableCrowdsale, MintedCrowdsale { - constructor( - uint256 openingTime, - uint256 closingTime, - uint256 rate, - address wallet, - uint256 cap, - ERC20Mintable token, - uint256 goal - ) - public - Crowdsale(rate, wallet, token) - CappedCrowdsale(cap) - TimedCrowdsale(openingTime, closingTime) - RefundableCrowdsale(goal) - { - } - function initialize( uint256 openingTime, uint256 closingTime, diff --git a/contracts/mocks/AllowanceCrowdsaleImpl.sol b/contracts/mocks/AllowanceCrowdsaleImpl.sol index c354a4e13..6f641086d 100644 --- a/contracts/mocks/AllowanceCrowdsaleImpl.sol +++ b/contracts/mocks/AllowanceCrowdsaleImpl.sol @@ -14,8 +14,6 @@ contract AllowanceCrowdsaleImpl is Initializable, Crowdsale, AllowanceCrowdsale address tokenWallet ) public - Crowdsale(rate, wallet, token) - AllowanceCrowdsale(tokenWallet) { Crowdsale.initialize(rate, wallet, token); AllowanceCrowdsale.initialize(tokenWallet); diff --git a/contracts/mocks/CappedCrowdsaleImpl.sol b/contracts/mocks/CappedCrowdsaleImpl.sol index 59924f538..75ec99ce3 100644 --- a/contracts/mocks/CappedCrowdsaleImpl.sol +++ b/contracts/mocks/CappedCrowdsaleImpl.sol @@ -14,8 +14,6 @@ contract CappedCrowdsaleImpl is Initializable, Crowdsale, CappedCrowdsale { uint256 cap ) public - Crowdsale(rate, wallet, token) - CappedCrowdsale(cap) { Crowdsale.initialize(rate, wallet, token); CappedCrowdsale.initialize(cap); diff --git a/contracts/mocks/CrowdsaleMock.sol b/contracts/mocks/CrowdsaleMock.sol index f3d0f6609..2f40284b4 100644 --- a/contracts/mocks/CrowdsaleMock.sol +++ b/contracts/mocks/CrowdsaleMock.sol @@ -5,7 +5,7 @@ import "../crowdsale/Crowdsale.sol"; contract CrowdsaleMock is Initializable, Crowdsale { - constructor(uint256 rate, address wallet, IERC20 token) public Crowdsale(rate, wallet, token) { + constructor(uint256 rate, address wallet, IERC20 token) public { Crowdsale.initialize(rate, wallet, token); } } diff --git a/contracts/mocks/FinalizableCrowdsaleImpl.sol b/contracts/mocks/FinalizableCrowdsaleImpl.sol index 0092b3ed6..c85d467bd 100644 --- a/contracts/mocks/FinalizableCrowdsaleImpl.sol +++ b/contracts/mocks/FinalizableCrowdsaleImpl.sol @@ -15,8 +15,6 @@ contract FinalizableCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, F IERC20 token ) public - Crowdsale(rate, wallet, token) - TimedCrowdsale(openingTime, closingTime) { Crowdsale.initialize(rate, wallet, token); TimedCrowdsale.initialize(openingTime, closingTime); diff --git a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol b/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol index 86dab4e83..8ffa432e0 100644 --- a/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol +++ b/contracts/mocks/IncreasingPriceCrowdsaleImpl.sol @@ -16,9 +16,6 @@ contract IncreasingPriceCrowdsaleImpl is Initializable, IncreasingPriceCrowdsale uint256 finalRate ) public - Crowdsale(initialRate, wallet, token) - TimedCrowdsale(openingTime, closingTime) - IncreasingPriceCrowdsale(initialRate, finalRate) { Crowdsale.initialize(initialRate, wallet, token); TimedCrowdsale.initialize(openingTime, closingTime); diff --git a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol b/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol index cfcdfed3c..6a9407a9e 100644 --- a/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol +++ b/contracts/mocks/IndividuallyCappedCrowdsaleImpl.sol @@ -15,7 +15,6 @@ contract IndividuallyCappedCrowdsaleImpl IERC20 token ) public - Crowdsale(rate, wallet, token) { Crowdsale.initialize(rate, wallet, token); IndividuallyCappedCrowdsale.initialize(); diff --git a/contracts/mocks/MintedCrowdsaleImpl.sol b/contracts/mocks/MintedCrowdsaleImpl.sol index 5a8db00ce..24160dd72 100644 --- a/contracts/mocks/MintedCrowdsaleImpl.sol +++ b/contracts/mocks/MintedCrowdsaleImpl.sol @@ -13,7 +13,6 @@ contract MintedCrowdsaleImpl is Initializable, MintedCrowdsale { ERC20Mintable token ) public - Crowdsale(rate, wallet, token) { Crowdsale.initialize(rate, wallet, token); } diff --git a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol b/contracts/mocks/PostDeliveryCrowdsaleImpl.sol index 679bb0537..e8d23d535 100644 --- a/contracts/mocks/PostDeliveryCrowdsaleImpl.sol +++ b/contracts/mocks/PostDeliveryCrowdsaleImpl.sol @@ -15,8 +15,6 @@ contract PostDeliveryCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, IERC20 token ) public - TimedCrowdsale(openingTime, closingTime) - Crowdsale(rate, wallet, token) { Crowdsale.initialize(rate, wallet, token); TimedCrowdsale.initialize(openingTime, closingTime); diff --git a/contracts/mocks/RefundableCrowdsaleImpl.sol b/contracts/mocks/RefundableCrowdsaleImpl.sol index d7fc34d12..195d5189e 100644 --- a/contracts/mocks/RefundableCrowdsaleImpl.sol +++ b/contracts/mocks/RefundableCrowdsaleImpl.sol @@ -16,9 +16,6 @@ contract RefundableCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale, Re uint256 goal ) public - Crowdsale(rate, wallet, token) - TimedCrowdsale(openingTime, closingTime) - RefundableCrowdsale(goal) { Crowdsale.initialize(rate, wallet, token); TimedCrowdsale.initialize(openingTime, closingTime); diff --git a/contracts/mocks/SampleCrowdsaleMock.sol b/contracts/mocks/SampleCrowdsaleMock.sol index 598a552cf..dc70277da 100644 --- a/contracts/mocks/SampleCrowdsaleMock.sol +++ b/contracts/mocks/SampleCrowdsaleMock.sol @@ -21,7 +21,6 @@ contract SampleCrowdsaleMock is Initializable, SampleCrowdsale { uint256 goal ) public - SampleCrowdsale(openingTime, closingTime, rate, wallet, cap, token, goal) { SampleCrowdsale.initialize(openingTime, closingTime, rate, wallet, cap, token, goal); } diff --git a/contracts/mocks/TimedCrowdsaleImpl.sol b/contracts/mocks/TimedCrowdsaleImpl.sol index 2148bcca2..640f47181 100644 --- a/contracts/mocks/TimedCrowdsaleImpl.sol +++ b/contracts/mocks/TimedCrowdsaleImpl.sol @@ -15,8 +15,6 @@ contract TimedCrowdsaleImpl is Initializable, Crowdsale, TimedCrowdsale { IERC20 token ) public - Crowdsale(rate, wallet, token) - TimedCrowdsale(openingTime, closingTime) { Crowdsale.initialize(rate, wallet, token); TimedCrowdsale.initialize(openingTime, closingTime);