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

convert ERC20Pausable to initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-25 18:53:24 -03:00
parent c630cb4016
commit 0962b9e5e6
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
contracts/mocks/ERC20PausableMock.sol
View File

@ -1,13 +1,16 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../token/ERC20/ERC20Pausable.sol"; import "../token/ERC20/ERC20Pausable.sol";
import "./PauserRoleMock.sol"; import "./PauserRoleMock.sol";
// mock class using ERC20Pausable // mock class using ERC20Pausable
contract ERC20PausableMock is ERC20Pausable, PauserRoleMock { contract ERC20PausableMock is Initializable, ERC20Pausable, PauserRoleMock {
constructor(address initialAccount, uint initialBalance) public { constructor(address initialAccount, uint initialBalance) public {
ERC20Pausable.initialize();
_mint(initialAccount, initialBalance); _mint(initialAccount, initialBalance);
} }

7
contracts/token/ERC20/ERC20Pausable.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 "../../lifecycle/Pausable.sol"; import "../../lifecycle/Pausable.sol";
@ -8,7 +9,11 @@ import "../../lifecycle/Pausable.sol";
* @title Pausable token * @title Pausable token
* @dev ERC20 modified with pausable transfers. * @dev ERC20 modified with pausable transfers.
**/ **/
contract ERC20Pausable is ERC20, Pausable { contract ERC20Pausable is Initializable, ERC20, Pausable {
function initialize() public initializer {
Pausable.initialize();
}
function transfer( function transfer(
address to, address to,