Merge pull request OpenZeppelin#323 from pooleja/fix/ownable_error

Fix/ownable error - Silent transferOwnership Failure
classicdelta · Jul 22, 2017 · b4653f6 · b4653f6
2 parents 6317d9e + bf308f6
commit b4653f6
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/contracts/ownership/Ownable.sol b/contracts/ownership/Ownable.sol
@@ -33,9 +33,8 @@ contract Ownable {
    * @param newOwner The address to transfer ownership to.
    */
   function transferOwnership(address newOwner) onlyOwner {
-    if (newOwner != address(0)) {
-      owner = newOwner;
-    }
+    require(newOwner != address(0));      
+    owner = newOwner;
   }
 
 }
diff --git a/test/Ownable.js b/test/Ownable.js
@@ -36,10 +36,12 @@ contract('Ownable', function(accounts) {
 
   it('should guard ownership against stuck state', async function() {
     let originalOwner = await ownable.owner();
-    await ownable.transferOwnership(null, {from: originalOwner});
-    let newOwner = await ownable.owner();
-
-    assert.equal(originalOwner, newOwner);
+    try {
+      await ownable.transferOwnership(null, {from: originalOwner});
+      assert.fail();
+    } catch(error) {
+      assertJump(error);
+    }
   });
 
-});
+});