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

add explicit initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-05-18 21:45:34 -03:00
parent 32e93579fa
commit 27a6a15d66
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/lifecycle/Pausable.sol
View File

@ -8,13 +8,17 @@ import "../ownership/Ownable.sol";
* @title Pausable
* @dev Base contract which allows children to implement an emergency stop mechanism.
*/
contract Pausable is Ownable {
contract Pausable is Migratable, Ownable {
event Pause();
event Unpause();
bool public paused = false;
function initialize(address _sender) isInitializer("Pausable", "1.9.0-beta") {
Ownable.initialize(_sender);
}
/**
* @dev Modifier to make a function callable only when the contract is not paused.
*/

6
contracts/token/ERC20/PausableToken.sol
View File

@ -8,7 +8,11 @@ import "../../lifecycle/Pausable.sol";
* @title Pausable token
* @dev StandardToken modified with pausable transfers.
**/
contract PausableToken is StandardToken, Pausable {
contract PausableToken is Migratable, StandardToken, Pausable {
function initialize(address _sender) isInitializer("PausableToken", "1.9.0-beta") {
Pausable.initialize(_sender);
}
function transfer(address _to, uint256 _value) public whenNotPaused returns (bool) {
return super.transfer(_to, _value);