Merge branch 'master' of https://github.com/OpenZeppelin/zeppelin-solidity into vesting

contracts/lifecycle/Stoppable.sol → 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) _; }

contracts/test-helpers/StoppableMock.sol → contracts/test-helpers/PausableMock.sol

 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;
   }

contracts/token/BasicToken.sol

@@ -14,9 +14,6 @@ contract BasicToken is ERC20Basic, SafeMath {
   mapping(address => uint) balances;
 
   function transfer(address _to, uint _value) {
-    if (balances[msg.sender] < _value) {
-      throw;
-    } 
     balances[msg.sender] = safeSub(balances[msg.sender], _value);
     balances[_to] = safeAdd(balances[_to], _value);
     Transfer(msg.sender, _to, _value);

docs/source/index.rst

@@ -26,7 +26,7 @@ The code is open-source, and `available on github <https://github.com/OpenZeppel
    :caption: Smart Contracts
    
    ownable
-   stoppable
+   Pausable
    killable
    claimable
    migrations

docs/source/stoppable.rst → docs/source/pausable.rst

-Stoppable
+Pausable
 =============================================
 
 Base contract that provides an emergency stop mechanism.

test/Pausable.js

+contract('Pausable', function(accounts) {
+
+  it("can perform normal process in non-emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let count0 = await Pausable.count();
+    assert.equal(count0, 0);
+
+    let normalProcess = await Pausable.normalProcess();
+    let count1 = await Pausable.count();
+    assert.equal(count1, 1);
+  });
+
+  it("can not perform normal process in emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let emergencyStop = await Pausable.emergencyStop();
+    let count0 = await Pausable.count();
+    assert.equal(count0, 0);
+
+    let normalProcess = await Pausable.normalProcess();
+    let count1 = await Pausable.count();
+    assert.equal(count1, 0);
+  });
+
+
+  it("can not take drastic measure in non-emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let drasticMeasure = await Pausable.drasticMeasure();
+    let drasticMeasureTaken = await Pausable.drasticMeasureTaken();
+
+    assert.isFalse(drasticMeasureTaken);
+  });
+
+  it("can take a drastic measure in an emergency", async function() {
+    let Pausable = await PausableMock.new();
+    let emergencyStop = await Pausable.emergencyStop();
+    let drasticMeasure = await Pausable.drasticMeasure();
+    let drasticMeasureTaken = await Pausable.drasticMeasureTaken();
+
+    assert.isTrue(drasticMeasureTaken);
+  });
+
+  it("should resume allowing normal process after emergency is over", async function() {
+    let Pausable = await PausableMock.new();
+    let emergencyStop = await Pausable.emergencyStop();
+    let release = await Pausable.release();
+    let normalProcess = await Pausable.normalProcess();
+    let count0 = await Pausable.count();
+
+    assert.equal(count0, 1);
+  });
+
+});

test/Stoppable.js

-contract('Stoppable', function(accounts) {
-
-  it("can perform normal process in non-emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let count0 = await stoppable.count();
-    assert.equal(count0, 0);
-
-    let normalProcess = await stoppable.normalProcess();
-    let count1 = await stoppable.count();
-    assert.equal(count1, 1);
-  });
-
-  it("can not perform normal process in emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let emergencyStop = await stoppable.emergencyStop();
-    let count0 = await stoppable.count();
-    assert.equal(count0, 0);
-
-    let normalProcess = await stoppable.normalProcess();
-    let count1 = await stoppable.count();
-    assert.equal(count1, 0);
-  });
-
-
-  it("can not take drastic measure in non-emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let drasticMeasure = await stoppable.drasticMeasure();
-    let drasticMeasureTaken = await stoppable.drasticMeasureTaken();
-
-    assert.isFalse(drasticMeasureTaken);
-  });
-
-  it("can take a drastic measure in an emergency", async function() {
-    let stoppable = await StoppableMock.new();
-    let emergencyStop = await stoppable.emergencyStop();
-    let drasticMeasure = await stoppable.drasticMeasure();
-    let drasticMeasureTaken = await stoppable.drasticMeasureTaken();
-
-    assert.isTrue(drasticMeasureTaken);
-  });
-
-  it("should resume allowing normal process after emergency is over", async function() {
-    let stoppable = await StoppableMock.new();
-    let emergencyStop = await stoppable.emergencyStop();
-    let release = await stoppable.release();
-    let normalProcess = await stoppable.normalProcess();
-    let count0 = await stoppable.count();
-
-    assert.equal(count0, 1);
-  });
-
-});