Browse Source

[Heritable] added HeirOwnershipClaimed event

zava 7 years ago
parent
commit
5ea9bd44a1
2 changed files with 6 additions and 1 deletions
  1. 2 0
      contracts/ownership/Heritable.sol
  2. 4 1
      test/Heritable.js

+ 2 - 0
contracts/ownership/Heritable.sol

@@ -23,6 +23,7 @@ contract Heritable is Ownable {
   event HeirChanged(address indexed owner, address indexed newHeir);
   event HeirChanged(address indexed owner, address indexed newHeir);
   event OwnerHeartbeated(address indexed owner);
   event OwnerHeartbeated(address indexed owner);
   event OwnerProclaimedDead(address indexed owner, address indexed heir, uint timeOfDeath);
   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(!ownerLives());
     require(now >= timeOfDeath + heartbeatTimeout);
     require(now >= timeOfDeath + heartbeatTimeout);
     OwnershipTransferred(owner, heir);
     OwnershipTransferred(owner, heir);
+    HeirOwnershipClaimed(owner, heir);
     owner = heir;
     owner = heir;
     timeOfDeath = 0;
     timeOfDeath = 0;
   }
   }

+ 4 - 1
test/Heritable.js

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