Merge pull request #323 from pooleja/fix/ownable_error

Fix/ownable error - Silent transferOwnership Failure
pull/328/head
Francisco Giordano 8 years ago committed by GitHub
commit e9cf6dfb60
  1. 5
      contracts/ownership/Ownable.sol
  2. 12
      test/Ownable.js

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

@ -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);
}
});
});
});
Loading…
Cancel
Save