Commit 77e73221 by qdeswaef

Also change claimable to avoid conflicts with ERC20 tokens

parent 41fdd5d4
......@@ -18,7 +18,7 @@ contract Claimable is Ownable {
_;
}
function transfer(address newOwner) onlyOwner {
function transferOwnership(address newOwner) onlyOwner {
pendingOwner = newOwner;
}
......
......@@ -12,7 +12,7 @@ contract('Claimable', function(accounts) {
it("changes pendingOwner after transfer", async function() {
let newOwner = accounts[1];
let transfer = await claimable.transfer(newOwner);
let transfer = await claimable.transferOwnership(newOwner);
let pendingOwner = await claimable.pendingOwner();
assert.isTrue(pendingOwner === newOwner);
......@@ -26,7 +26,7 @@ contract('Claimable', function(accounts) {
});
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();
assert.isFalse(pendingOwner === accounts[2]);
......@@ -37,7 +37,7 @@ contract('Claimable', function(accounts) {
beforeEach(async function () {
newOwner = accounts[1];
await claimable.transfer(newOwner);
await claimable.transferOwnership(newOwner);
});
it("changes allow pending owner to claim ownership", async function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment