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

claimBefore modifier removed on DelayedClaimable contract

Browse Source
This commit is contained in:
AugustoL
2016-12-07 18:32:42 -03:00
parent c7eb6736ee
commit 423cec41e3
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contracts/DelayedClaimable.sol
View File

@ -10,16 +10,12 @@ import './Claimable.sol';
contract DelayedClaimable is Ownable, Claimable {
uint public claimBeforeBlock;
modifier claimBefore() {
if (block.number < claimBeforeBlock)
_;
}
function setClaimBefore(uint _claimBeforeBlock) onlyOwner {
claimBeforeBlock = _claimBeforeBlock;
}
function claimOwnership() onlyPendingOwner claimBefore {
function claimOwnership() onlyPendingOwner {
if (block.number > claimBeforeBlock) throw;
owner = pendingOwner;
pendingOwner = 0x0;
claimBeforeBlock = 0;

21
test/DelayedClaimble.js
View File

@ -8,8 +8,7 @@ contract('DelayedClaimable', function(accounts) {
});
it("changes pendingOwner after transfer succesful", function(done) {
var newOwner = accounts[2];
return delayedClaimable.transfer(newOwner)
return delayedClaimable.transfer(accounts[2])
.then(function(){
return delayedClaimable.setClaimBefore(1000)
})
@ -21,21 +20,20 @@ contract('DelayedClaimable', function(accounts) {
return delayedClaimable.pendingOwner();
})
.then(function(pendingOwner) {
assert.isTrue(pendingOwner === newOwner);
return delayedClaimable.claimOwnership({from: newOwner});
assert.isTrue(pendingOwner === accounts[2]);
return delayedClaimable.claimOwnership({from: accounts[2]});
})
.then(function() {
return delayedClaimable.owner();
})
.then(function(owner) {
assert.isTrue(owner === newOwner);
assert.isTrue(owner === accounts[2]);
})
.then(done)
});
it("changes pendingOwner after transfer fails", function(done) {
var newOwner = accounts[1];
return delayedClaimable.transfer(newOwner)
return delayedClaimable.transfer(accounts[1])
.then(function(){
return delayedClaimable.setClaimBefore(1)
})
@ -47,14 +45,17 @@ contract('DelayedClaimable', function(accounts) {
return delayedClaimable.pendingOwner();
})
.then(function(pendingOwner) {
assert.isTrue(pendingOwner === newOwner);
return delayedClaimable.claimOwnership({from: newOwner});
assert.isTrue(pendingOwner === accounts[1]);
return delayedClaimable.claimOwnership({from: accounts[1]});
})
.catch(function(error) {
if (error.message.search('invalid JUMP') == -1) throw error
})
.then(function() {
return delayedClaimable.owner();
})
.then(function(owner) {
assert.isTrue(owner != newOwner);
assert.isTrue(owner != accounts[1]);
})
.then(done)
});