From ae73f1a5646c4e671fa21978082ac964558fc991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Gabriel=20Carvalho?= Date: Mon, 30 Jan 2017 23:30:43 -0200 Subject: [PATCH] Renamed files and replaced occurencies of 'Stoppable' to 'Pausable' --- .../lifecycle/{Stoppable.sol => Pausable.sol} | 4 +- .../{StoppableMock.sol => PausableMock.sol} | 8 +-- docs/source/index.rst | 2 +- docs/source/{stoppable.rst => pausable.rst} | 2 +- test/Pausable.js | 52 +++++++++++++++++++ test/Stoppable.js | 52 ------------------- 6 files changed, 60 insertions(+), 60 deletions(-) rename contracts/lifecycle/{Stoppable.sol => Pausable.sol} (92%) rename contracts/test-helpers/{StoppableMock.sol => PausableMock.sol} (69%) rename docs/source/{stoppable.rst => pausable.rst} (98%) create mode 100644 test/Pausable.js delete mode 100644 test/Stoppable.js diff --git a/contracts/lifecycle/Stoppable.sol b/contracts/lifecycle/Pausable.sol similarity index 92% rename from contracts/lifecycle/Stoppable.sol rename to contracts/lifecycle/Pausable.sol index 2dc37d6fc..5c2b2941c 100644 --- a/contracts/lifecycle/Stoppable.sol +++ b/contracts/lifecycle/Pausable.sol @@ -5,11 +5,11 @@ import "../ownership/Ownable.sol"; /* - * Stoppable + * Pausable * Abstract contract that allows children to implement an * emergency stop mechanism. */ -contract Stoppable is Ownable { +contract Pausable is Ownable { bool public stopped; modifier stopInEmergency { if (!stopped) _; } diff --git a/contracts/test-helpers/StoppableMock.sol b/contracts/test-helpers/PausableMock.sol similarity index 69% rename from contracts/test-helpers/StoppableMock.sol rename to contracts/test-helpers/PausableMock.sol index 32e456a20..267bff841 100644 --- a/contracts/test-helpers/StoppableMock.sol +++ b/contracts/test-helpers/PausableMock.sol @@ -1,15 +1,15 @@ pragma solidity ^0.4.4; -import '../lifecycle/Stoppable.sol'; +import '../lifecycle/Pausable.sol'; -// mock class using Stoppable -contract StoppableMock is Stoppable { +// mock class using Pausable +contract PausableMock is Pausable { bool public drasticMeasureTaken; uint public count; - function StoppableMock() { + function PausableMock() { drasticMeasureTaken = false; count = 0; } diff --git a/docs/source/index.rst b/docs/source/index.rst index 8ea157a6c..42ff0bda6 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -26,7 +26,7 @@ The code is open-source, and `available on github