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

Also change claimable to avoid conflicts with ERC20 tokens

Browse Source
This commit is contained in:
qdeswaef
2016-12-15 15:59:25 +01:00
parent 41fdd5d4c6
commit 77e732218e
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
contracts/Claimable.sol
View File

@ -7,8 +7,8 @@ import './Ownable.sol';
/* /*
* Claimable * Claimable
* *
* Extension for the Ownable contract, where the ownership needs to be claimed. This allows the new owner to accept the transfer. * Extension for the Ownable contract, where the ownership needs to be claimed. This allows the new owner to accept the transfer.
*/ */
contract Claimable is Ownable { contract Claimable is Ownable {
address public pendingOwner; address public pendingOwner;
@ -18,7 +18,7 @@ contract Claimable is Ownable {
_; _;
} }
function transfer(address newOwner) onlyOwner { function transferOwnership(address newOwner) onlyOwner {
pendingOwner = newOwner; pendingOwner = newOwner;
} }

8
test/Claimable.js
View File

@ -12,7 +12,7 @@ contract('Claimable', function(accounts) {
it("changes pendingOwner after transfer", async function() { it("changes pendingOwner after transfer", async function() {
let newOwner = accounts[1]; let newOwner = accounts[1];
let transfer = await claimable.transfer(newOwner); let transfer = await claimable.transferOwnership(newOwner);
let pendingOwner = await claimable.pendingOwner(); let pendingOwner = await claimable.pendingOwner();
assert.isTrue(pendingOwner === newOwner); assert.isTrue(pendingOwner === newOwner);
@ -21,12 +21,12 @@ contract('Claimable', function(accounts) {
it("should prevent to claimOwnership from no pendingOwner", async function() { it("should prevent to claimOwnership from no pendingOwner", async function() {
let claimedOwner = await claimable.claimOwnership({from: accounts[2]}); let claimedOwner = await claimable.claimOwnership({from: accounts[2]});
let owner = await claimable.owner(); let owner = await claimable.owner();
assert.isTrue(owner != accounts[2]); assert.isTrue(owner != accounts[2]);
}); });
it("should prevent non-owners from transfering", async function() { it("should prevent non-owners from transfering", async function() {
let transfer = await claimable.transfer(accounts[2], {from: accounts[2]}); let transfer = await claimable.transferOwnership(accounts[2], {from: accounts[2]});
let pendingOwner = await claimable.pendingOwner(); let pendingOwner = await claimable.pendingOwner();
assert.isFalse(pendingOwner === accounts[2]); assert.isFalse(pendingOwner === accounts[2]);
@ -37,7 +37,7 @@ contract('Claimable', function(accounts) {
beforeEach(async function () { beforeEach(async function () {
newOwner = accounts[1]; newOwner = accounts[1];
await claimable.transfer(newOwner); await claimable.transferOwnership(newOwner);
}); });
it("changes allow pending owner to claim ownership", async function() { it("changes allow pending owner to claim ownership", async function() {