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

convert ERC20Mintable

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-25 17:40:38 -03:00
parent 1f54c72d1d
commit 3f51d342d1
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/mocks/ERC20MintableMock.sol
View File

@ -1,8 +1,14 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Mintable.sol"; import "../token/ERC20/ERC20Mintable.sol";
import "./MinterRoleMock.sol"; import "./MinterRoleMock.sol";
contract ERC20MintableMock is ERC20Mintable, MinterRoleMock { contract ERC20MintableMock is Initializable, ERC20Mintable, MinterRoleMock {
constructor() public {
ERC20Mintable.initialize();
}
} }

7
contracts/token/ERC20/ERC20Mintable.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../../Initializable.sol";
import "./ERC20.sol"; import "./ERC20.sol";
import "../../access/roles/MinterRole.sol"; import "../../access/roles/MinterRole.sol";
@ -8,7 +9,7 @@ import "../../access/roles/MinterRole.sol";
* @title ERC20Mintable * @title ERC20Mintable
* @dev ERC20 minting logic * @dev ERC20 minting logic
*/ */
contract ERC20Mintable is ERC20, MinterRole { contract ERC20Mintable is Initializable, ERC20, MinterRole {
event MintingFinished(); event MintingFinished();
bool private _mintingFinished = false; bool private _mintingFinished = false;
@ -18,6 +19,10 @@ contract ERC20Mintable is ERC20, MinterRole {
_; _;
} }
function initialize() public initializer {
MinterRole.initialize();
}
/** /**
* @return true if the minting is finished. * @return true if the minting is finished.
*/ */