From f90fd5330efdfc4c54d6f29d34fc18846119b3e4 Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 25 Sep 2018 17:34:19 -0300 Subject: [PATCH] convert ERC20Detailed --- contracts/mocks/DetailedERC20Mock.sol | 8 +++++--- contracts/token/ERC20/ERC20Detailed.sol | 5 +++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/contracts/mocks/DetailedERC20Mock.sol b/contracts/mocks/DetailedERC20Mock.sol index 082c451be..ddf2ec83c 100644 --- a/contracts/mocks/DetailedERC20Mock.sol +++ b/contracts/mocks/DetailedERC20Mock.sol @@ -1,16 +1,18 @@ pragma solidity ^0.4.24; +import "../Initializable.sol"; import "../token/ERC20/ERC20.sol"; import "../token/ERC20/ERC20Detailed.sol"; -contract ERC20DetailedMock is ERC20, ERC20Detailed { +contract ERC20DetailedMock is Initializable, ERC20, ERC20Detailed { constructor( string name, string symbol, uint8 decimals ) - ERC20Detailed(name, symbol, decimals) public - {} + { + ERC20Detailed.initialize(name, symbol, decimals); + } } diff --git a/contracts/token/ERC20/ERC20Detailed.sol b/contracts/token/ERC20/ERC20Detailed.sol index ba411aa1f..72b431676 100644 --- a/contracts/token/ERC20/ERC20Detailed.sol +++ b/contracts/token/ERC20/ERC20Detailed.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.24; +import "../../Initializable.sol"; import "./IERC20.sol"; @@ -9,12 +10,12 @@ import "./IERC20.sol"; * All the operations are done using the smallest and indivisible token unit, * just as on Ethereum all the operations are done in wei. */ -contract ERC20Detailed is IERC20 { +contract ERC20Detailed is Initializable, IERC20 { string private _name; string private _symbol; uint8 private _decimals; - constructor(string name, string symbol, uint8 decimals) public { + function initialize(string name, string symbol, uint8 decimals) public initializer { _name = name; _symbol = symbol; _decimals = decimals;