Merge tag 'v2.1.1' of github.com:OpenZeppelin/openzeppelin-solidity

v2.1.1
This commit is contained in:
Francisco Giordano
2019-01-18 15:33:51 -03:00
237 changed files with 8562 additions and 4937 deletions

View File

@ -1,15 +1,14 @@
pragma solidity ^0.4.24;
pragma solidity ^0.5.0;
import "../lifecycle/Pausable.sol";
import "./PauserRoleMock.sol";
// mock class using Pausable
contract PausableMock is Pausable, PauserRoleMock {
bool public drasticMeasureTaken;
uint256 public count;
constructor() public {
constructor () public {
Pausable.initialize(msg.sender);
drasticMeasureTaken = false;
@ -23,5 +22,4 @@ contract PausableMock is Pausable, PauserRoleMock {
function drasticMeasure() external whenPaused {
drasticMeasureTaken = true;
}
}