From c630cb40162b253f6eb6ea28324feeeabd32d0be Mon Sep 17 00:00:00 2001 From: Francisco Giordano Date: Tue, 25 Sep 2018 18:51:19 -0300 Subject: [PATCH] convert Pausable to initializers --- contracts/lifecycle/Pausable.sol | 6 +++++- contracts/mocks/PausableMock.sol | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/contracts/lifecycle/Pausable.sol b/contracts/lifecycle/Pausable.sol index 6d5aec994..11dfb7142 100644 --- a/contracts/lifecycle/Pausable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -1,5 +1,6 @@ pragma solidity ^0.4.24; +import "../Initializable.sol"; import "../access/roles/PauserRole.sol"; @@ -7,12 +8,15 @@ import "../access/roles/PauserRole.sol"; * @title Pausable * @dev Base contract which allows children to implement an emergency stop mechanism. */ -contract Pausable is PauserRole { +contract Pausable is Initializable, PauserRole { event Paused(); event Unpaused(); bool private _paused = false; + function initialize() public initializer { + PauserRole.initialize(); + } /** * @return true if the contract is paused, false otherwise. diff --git a/contracts/mocks/PausableMock.sol b/contracts/mocks/PausableMock.sol index a1c24c087..63e76e086 100644 --- a/contracts/mocks/PausableMock.sol +++ b/contracts/mocks/PausableMock.sol @@ -1,16 +1,19 @@ pragma solidity ^0.4.24; +import "../Initializable.sol"; import "../lifecycle/Pausable.sol"; import "./PauserRoleMock.sol"; // mock class using Pausable -contract PausableMock is Pausable, PauserRoleMock { +contract PausableMock is Initializable, Pausable, PauserRoleMock { bool public drasticMeasureTaken; uint256 public count; constructor() public { + Pausable.initialize(); + drasticMeasureTaken = false; count = 0; }