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

convert AllowanceCrowdsale to initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-27 18:57:59 -03:00
parent 22f8660c8e
commit 6247a7bf7c
3 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/crowdsale/emission/AllowanceCrowdsale.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/IERC20.sol"; import "../../token/ERC20/IERC20.sol";
import "../../token/ERC20/SafeERC20.sol"; import "../../token/ERC20/SafeERC20.sol";
@ -10,17 +11,20 @@ import "../../math/SafeMath.sol";
* @title AllowanceCrowdsale * @title AllowanceCrowdsale
* @dev Extension of Crowdsale where tokens are held by a wallet, which approves an allowance to the crowdsale. * @dev Extension of Crowdsale where tokens are held by a wallet, which approves an allowance to the crowdsale.
*/ */
contract AllowanceCrowdsale is Crowdsale { contract AllowanceCrowdsale is Initializable, Crowdsale {
using SafeMath for uint256; using SafeMath for uint256;
using SafeERC20 for IERC20; using SafeERC20 for IERC20;
address private _tokenWallet; address private _tokenWallet;
constructor(address tokenWallet) public {
}
/** /**
* @dev Constructor, takes token wallet address. * @dev Constructor, takes token wallet address.
* @param tokenWallet Address holding the tokens, which has approved allowance to the crowdsale * @param tokenWallet Address holding the tokens, which has approved allowance to the crowdsale
*/ */
constructor(address tokenWallet) public { function initialize(address tokenWallet) public initializer {
require(tokenWallet != address(0)); require(tokenWallet != address(0));
_tokenWallet = tokenWallet; _tokenWallet = tokenWallet;
} }

5
contracts/mocks/AllowanceCrowdsaleImpl.sol
View File

@ -1,10 +1,11 @@
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/emission/AllowanceCrowdsale.sol"; import "../crowdsale/emission/AllowanceCrowdsale.sol";
contract AllowanceCrowdsaleImpl is AllowanceCrowdsale { contract AllowanceCrowdsaleImpl is Initializable, Crowdsale, AllowanceCrowdsale {
constructor ( constructor (
uint256 rate, uint256 rate,
@ -16,6 +17,8 @@ contract AllowanceCrowdsaleImpl is AllowanceCrowdsale {
Crowdsale(rate, wallet, token) Crowdsale(rate, wallet, token)
AllowanceCrowdsale(tokenWallet) AllowanceCrowdsale(tokenWallet)
{ {
Crowdsale.initialize(rate, wallet, token);
AllowanceCrowdsale.initialize(tokenWallet);
} }
} }

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

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