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

Merge pull request #323 from pooleja/fix/ownable_error

Browse Source 
Fix/ownable error - Silent transferOwnership Failure
This commit is contained in:
Francisco Giordano
2017-07-22 15:57:45 -03:00
committed by GitHub
parent 4d91118dd9 64787b1ac5
commit e9cf6dfb60
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/ownership/Ownable.sol
View File

@ -33,9 +33,8 @@ contract Ownable {
* @param newOwner The address to transfer ownership to. * @param newOwner The address to transfer ownership to.
*/ */
function transferOwnership(address newOwner) onlyOwner { function transferOwnership(address newOwner) onlyOwner {
if (newOwner != address(0)) { require(newOwner != address(0));
owner = newOwner; owner = newOwner;
} }
}
} }

8
test/Ownable.js
View File

@ -36,10 +36,12 @@ contract('Ownable', function(accounts) {
it('should guard ownership against stuck state', async function() { it('should guard ownership against stuck state', async function() {
let originalOwner = await ownable.owner(); let originalOwner = await ownable.owner();
try {
await ownable.transferOwnership(null, {from: originalOwner}); await ownable.transferOwnership(null, {from: originalOwner});
let newOwner = await ownable.owner(); assert.fail();
} catch(error) {
assert.equal(originalOwner, newOwner); assertJump(error);
}
}); });
}); });