Commit b1a80156 by Francisco Giordano

fix initializers and tests

parent 2eac2a79
...@@ -6,6 +6,6 @@ import "../token/ERC20/DetailedERC20.sol"; ...@@ -6,6 +6,6 @@ import "../token/ERC20/DetailedERC20.sol";
contract DetailedERC20Mock is StandardToken, DetailedERC20 { contract DetailedERC20Mock is StandardToken, DetailedERC20 {
function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) public { function DetailedERC20Mock(string _name, string _symbol, uint8 _decimals) public {
DetailedERC20.initialize(_name, _symbol, _decimals); DetailedERC20.initialize(msg.sender, _name, _symbol, _decimals);
} }
} }
...@@ -10,7 +10,7 @@ import "../token/ERC721/ERC721Token.sol"; ...@@ -10,7 +10,7 @@ import "../token/ERC721/ERC721Token.sol";
*/ */
contract ERC721TokenMock is ERC721Token { contract ERC721TokenMock is ERC721Token {
function ERC721TokenMock(string name, string symbol) public { function ERC721TokenMock(string name, string symbol) public {
ERC721Token.initialize(name, symbol); ERC721Token.initialize(msg.sender, name, symbol);
} }
function mint(address _to, uint256 _tokenId) public { function mint(address _to, uint256 _tokenId) public {
......
...@@ -19,7 +19,7 @@ contract('TokenTimelock', function ([_, owner, beneficiary]) { ...@@ -19,7 +19,7 @@ contract('TokenTimelock', function ([_, owner, beneficiary]) {
await this.token.initialize(owner); await this.token.initialize(owner);
this.releaseTime = latestTime() + duration.years(1); this.releaseTime = latestTime() + duration.years(1);
this.timelock = await TokenTimelock.new(); this.timelock = await TokenTimelock.new();
await this.timelock.initialize(this.token.address, beneficiary, this.releaseTime); await this.timelock.initialize(owner, this.token.address, beneficiary, this.releaseTime);
await this.token.mint(this.timelock.address, amount, { from: owner }); await this.token.mint(this.timelock.address, amount, { from: owner });
}); });
......
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