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

[Heritable] added HeirOwnershipClaimed event

Browse Source
This commit is contained in:
zava
2017-11-30 18:35:40 -03:00
committed by Alejandro Santander
parent 51c2c50437
commit 5ea9bd44a1
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contracts/ownership/Heritable.sol
View File

@ -23,6 +23,7 @@ contract Heritable is Ownable {
event HeirChanged(address indexed owner, address indexed newHeir);
event OwnerHeartbeated(address indexed owner);
event OwnerProclaimedDead(address indexed owner, address indexed heir, uint timeOfDeath);
event HeirOwnershipClaimed(address indexed previousOwner, address indexed newOwner);
/**
@ -83,6 +84,7 @@ contract Heritable is Ownable {
require(!ownerLives());
require(now >= timeOfDeath + heartbeatTimeout);
OwnershipTransferred(owner, heir);
HeirOwnershipClaimed(owner, heir);
owner = heir;
timeOfDeath = 0;
}

5
test/Heritable.js
View File

@ -67,7 +67,7 @@ contract('Heritable', function(accounts) {
it('heir can\'t claim ownership if owner heartbeats', async function() {
const heir = accounts[1]
await heritable.setHeir(heir, {from: owner})
await heritable.proclaimDeath({from: heir})
await heritable.heartbeat({from: owner})
await expectThrow(heritable.claimHeirOwnership({from: heir}))
@ -101,9 +101,12 @@ contract('Heritable', function(accounts) {
await increaseTime(4141)
const claimHeirOwnershipLogs = (await heritable.claimHeirOwnership({from: heir})).logs
const ownershipTransferredEvent = claimHeirOwnershipLogs.find(e => e.event === 'OwnershipTransferred')
const heirOwnershipClaimedEvent = claimHeirOwnershipLogs.find(e => e.event === 'HeirOwnershipClaimed')
assert.isTrue(ownershipTransferredEvent.args.previousOwner === owner)
assert.isTrue(ownershipTransferredEvent.args.newOwner === heir)
assert.isTrue(heirOwnershipClaimedEvent.args.previousOwner === owner)
assert.isTrue(heirOwnershipClaimedEvent.args.newOwner === heir)
})
})