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

convert Pausable to initializers

Browse Source
This commit is contained in:
Francisco Giordano
2018-09-25 18:51:19 -03:00
parent 21e016378c
commit c630cb4016
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/lifecycle/Pausable.sol
View File

@ -1,5 +1,6 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../access/roles/PauserRole.sol"; import "../access/roles/PauserRole.sol";
@ -7,12 +8,15 @@ import "../access/roles/PauserRole.sol";
* @title Pausable * @title Pausable
* @dev Base contract which allows children to implement an emergency stop mechanism. * @dev Base contract which allows children to implement an emergency stop mechanism.
*/ */
contract Pausable is PauserRole { contract Pausable is Initializable, PauserRole {
event Paused(); event Paused();
event Unpaused(); event Unpaused();
bool private _paused = false; bool private _paused = false;
function initialize() public initializer {
PauserRole.initialize();
}
/** /**
* @return true if the contract is paused, false otherwise. * @return true if the contract is paused, false otherwise.

5
contracts/mocks/PausableMock.sol
View File

@ -1,16 +1,19 @@
pragma solidity ^0.4.24; pragma solidity ^0.4.24;
import "../Initializable.sol";
import "../lifecycle/Pausable.sol"; import "../lifecycle/Pausable.sol";
import "./PauserRoleMock.sol"; import "./PauserRoleMock.sol";
// mock class using Pausable // mock class using Pausable
contract PausableMock is Pausable, PauserRoleMock { contract PausableMock is Initializable, Pausable, PauserRoleMock {
bool public drasticMeasureTaken; bool public drasticMeasureTaken;
uint256 public count; uint256 public count;
constructor() public { constructor() public {
Pausable.initialize();
drasticMeasureTaken = false; drasticMeasureTaken = false;
count = 0; count = 0;
} }