Commit c4487ba8 by Francisco Giordano

convert CappedCrowdsale

parent 2c2d80d9
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "../../math/SafeMath.sol"; import "../../math/SafeMath.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
...@@ -8,16 +9,19 @@ import "../Crowdsale.sol"; ...@@ -8,16 +9,19 @@ import "../Crowdsale.sol";
* @title CappedCrowdsale * @title CappedCrowdsale
* @dev Crowdsale with a limit for total contributions. * @dev Crowdsale with a limit for total contributions.
*/ */
contract CappedCrowdsale is Crowdsale { contract CappedCrowdsale is Initializable, Crowdsale {
using SafeMath for uint256; using SafeMath for uint256;
uint256 private _cap; uint256 private _cap;
constructor(uint256 cap) public {
}
/** /**
* @dev Constructor, takes maximum amount of wei accepted in the crowdsale. * @dev Constructor, takes maximum amount of wei accepted in the crowdsale.
* @param cap Max amount of wei to be contributed * @param cap Max amount of wei to be contributed
*/ */
constructor(uint256 cap) public { function initialize(uint256 cap) public initializer {
require(cap > 0); require(cap > 0);
_cap = cap; _cap = cap;
} }
......
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/IERC20.sol"; import "../token/ERC20/IERC20.sol";
import "../crowdsale/validation/CappedCrowdsale.sol"; import "../crowdsale/validation/CappedCrowdsale.sol";
contract CappedCrowdsaleImpl is CappedCrowdsale { contract CappedCrowdsaleImpl is Initializable, Crowdsale, CappedCrowdsale {
constructor ( constructor (
uint256 rate, uint256 rate,
...@@ -16,6 +17,8 @@ contract CappedCrowdsaleImpl is CappedCrowdsale { ...@@ -16,6 +17,8 @@ contract CappedCrowdsaleImpl is CappedCrowdsale {
Crowdsale(rate, wallet, token) Crowdsale(rate, wallet, token)
CappedCrowdsale(cap) CappedCrowdsale(cap)
{ {
Crowdsale.initialize(rate, wallet, token);
CappedCrowdsale.initialize(cap);
} }
} }
...@@ -9,7 +9,7 @@ require('chai') ...@@ -9,7 +9,7 @@ require('chai')
.should(); .should();
const CappedCrowdsale = artifacts.require('CappedCrowdsaleImpl'); const CappedCrowdsale = artifacts.require('CappedCrowdsaleImpl');
const SimpleToken = artifacts.require('SimpleToken'); const SimpleToken = artifacts.require('SimpleTokenMock');
contract('CappedCrowdsale', function ([_, wallet]) { contract('CappedCrowdsale', function ([_, wallet]) {
const rate = new BigNumber(1); const rate = new BigNumber(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment