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

changed Inherited event for OwnershipTransfered

Browse Source
This commit is contained in:
zava
2017-11-29 22:42:33 -03:00
committed by Alejandro Santander
parent e5960465a7
commit 82c85121bb
3 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
contracts/ownership/Inheritable.sol
View File

@ -23,7 +23,6 @@ contract Inheritable 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 Inherited(address indexed previousOwner, address indexed newOwner);
/** /**
@ -83,7 +82,7 @@ contract Inheritable is Ownable {
function inherit() public onlyHeir { function inherit() public onlyHeir {
require(!ownerLives()); require(!ownerLives());
require(now >= timeOfDeath + heartbeatTimeout); require(now >= timeOfDeath + heartbeatTimeout);
Inherited(owner, heir); OwnershipTransferred(owner, heir);
owner = heir; owner = heir;
timeOfDeath = 0; timeOfDeath = 0;
} }

2
test/Inheritable.js
View File

@ -128,7 +128,7 @@ contract('Inheritable', function(accounts) {
await increaseTime(4141) await increaseTime(4141)
const inheritLogs = (await inheritable.inherit({from: heir})).logs const inheritLogs = (await inheritable.inherit({from: heir})).logs
const ownershipTransferredEvent = inheritLogs.find(e => e.event === 'Inherited') const ownershipTransferredEvent = inheritLogs.find(e => e.event === 'OwnershipTransferred')
assert.isTrue(ownershipTransferredEvent.args.previousOwner === owner) assert.isTrue(ownershipTransferredEvent.args.previousOwner === owner)
assert.isTrue(ownershipTransferredEvent.args.newOwner === heir) assert.isTrue(ownershipTransferredEvent.args.newOwner === heir)

16
test/SimpleSavingsWallet.js Normal file
View File

@ -0,0 +1,16 @@
'use strict'
const SimpleSavingsWallet = artifacts.require('../contracts/examples/SimpleSavingsWallet.sol')
contract('SimpleSavingsWallet', function(accounts) {
let savingsWallet
let owner
beforeEach(async function() {
savingsWallet = await SimpleSavingsWallet.new(4141)
owner = await inheritable.owner()
})
it('should receive funds', async function() {
await web3.eth.sendTransaction({from: owner, to: this.contract.address, value: amount})
})