NoBey/openzeppelin-contracts
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert MintedCrowdsale to initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-27 18:53:31 -03:00
parent 175e2c7254
commit 22f8660c8e
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/crowdsale/emission/MintedCrowdsale.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "../Crowdsale.sol"; import "../Crowdsale.sol";
import "../../token/ERC20/ERC20Mintable.sol"; import "../../token/ERC20/ERC20Mintable.sol";
@ -9,7 +10,7 @@ import "../../token/ERC20/ERC20Mintable.sol";
* @dev Extension of Crowdsale contract whose tokens are minted in each purchase. * @dev Extension of Crowdsale contract whose tokens are minted in each purchase.
* Token ownership should be transferred to MintedCrowdsale for minting. * Token ownership should be transferred to MintedCrowdsale for minting.
*/ */
contract MintedCrowdsale is Crowdsale { contract MintedCrowdsale is Initializable, Crowdsale {
/** /**
* @dev Overrides delivery by minting tokens upon purchase. * @dev Overrides delivery by minting tokens upon purchase.

4
contracts/mocks/MintedCrowdsaleImpl.sol
View File

@ -1,10 +1,11 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Mintable.sol"; import "../token/ERC20/ERC20Mintable.sol";
import "../crowdsale/emission/MintedCrowdsale.sol"; import "../crowdsale/emission/MintedCrowdsale.sol";
contract MintedCrowdsaleImpl is MintedCrowdsale { contract MintedCrowdsaleImpl is Initializable, MintedCrowdsale {
constructor ( constructor (
uint256 rate, uint256 rate,
@ -14,6 +15,7 @@ contract MintedCrowdsaleImpl is MintedCrowdsale {
public public
Crowdsale(rate, wallet, token) Crowdsale(rate, wallet, token)
{ {
Crowdsale.initialize(rate, wallet, token);
} }
} }

2
test/crowdsale/MintedCrowdsale.test.js
View File

@ -5,7 +5,7 @@ const { assertRevert } = require('../helpers/assertRevert');
const BigNumber = web3.BigNumber; const BigNumber = web3.BigNumber;
const MintedCrowdsale = artifacts.require('MintedCrowdsaleImpl'); const MintedCrowdsale = artifacts.require('MintedCrowdsaleImpl');
const ERC20Mintable = artifacts.require('ERC20Mintable'); const ERC20Mintable = artifacts.require('ERC20MintableMock');
const ERC20 = artifacts.require('ERC20'); const ERC20 = artifacts.require('ERC20');
contract('MintedCrowdsale', function ([_, deployer, investor, wallet, purchaser]) { contract('MintedCrowdsale', function ([_, deployer, investor, wallet, purchaser]) {