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

Merge with master

Browse Source
This commit is contained in:
Jorge Izquierdo
2017-05-21 16:08:47 -04:00
parent 929367f0ab
commit a6a2ee2bf1
61 changed files with 1272 additions and 227 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/helpers/PausableMock.sol
View File

@ -14,11 +14,11 @@ contract PausableMock is Pausable {
count = 0;
}
function normalProcess() external stopInEmergency {
function normalProcess() external whenNotPaused {
count++;
}
function drasticMeasure() external onlyInEmergency {
function drasticMeasure() external whenPaused {
drasticMeasureTaken = true;
}