File tree 2 files changed +8
-4
lines changed
2 files changed +8
-4
lines changed Original file line number Diff line number Diff line change @@ -8,7 +8,6 @@ pragma solidity ^0.4.24;
8
8
contract Ownable {
9
9
address private _owner;
10
10
11
- event OwnershipRenounced (address indexed previousOwner );
12
11
event OwnershipTransferred (
13
12
address indexed previousOwner ,
14
13
address indexed newOwner
@@ -20,6 +19,7 @@ contract Ownable {
20
19
*/
21
20
constructor () public {
22
21
_owner = msg .sender ;
22
+ emit OwnershipTransferred (address (0 ), _owner);
23
23
}
24
24
25
25
/**
@@ -51,7 +51,7 @@ contract Ownable {
51
51
* modifier anymore.
52
52
*/
53
53
function renounceOwnership () public onlyOwner {
54
- emit OwnershipRenounced (_owner);
54
+ emit OwnershipTransferred (_owner, address ( 0 ) );
55
55
_owner = address (0 );
56
56
}
57
57
Original file line number Diff line number Diff line change 1
1
const { expectThrow } = require ( '../helpers/expectThrow' ) ;
2
2
const { EVMRevert } = require ( '../helpers/EVMRevert' ) ;
3
+ const expectEvent = require ( '../helpers/expectEvent' ) ;
3
4
4
5
const ZERO_ADDRESS = '0x0000000000000000000000000000000000000000' ;
5
6
@@ -14,7 +15,8 @@ function shouldBehaveLikeOwnable (owner, [anyone]) {
14
15
15
16
it ( 'changes owner after transfer' , async function ( ) {
16
17
( await this . ownable . isOwner ( { from : anyone } ) ) . should . be . equal ( false ) ;
17
- await this . ownable . transferOwnership ( anyone , { from : owner } ) ;
18
+ const { logs } = await this . ownable . transferOwnership ( anyone , { from : owner } ) ;
19
+ expectEvent . inLogs ( logs , 'OwnershipTransferred' ) ;
18
20
19
21
( await this . ownable . owner ( ) ) . should . equal ( anyone ) ;
20
22
( await this . ownable . isOwner ( { from : anyone } ) ) . should . be . equal ( true ) ;
@@ -29,7 +31,9 @@ function shouldBehaveLikeOwnable (owner, [anyone]) {
29
31
} ) ;
30
32
31
33
it ( 'loses owner after renouncement' , async function ( ) {
32
- await this . ownable . renounceOwnership ( { from : owner } ) ;
34
+ const { logs } = await this . ownable . renounceOwnership ( { from : owner } ) ;
35
+ expectEvent . inLogs ( logs , 'OwnershipTransferred' ) ;
36
+
33
37
( await this . ownable . owner ( ) ) . should . equal ( ZERO_ADDRESS ) ;
34
38
} ) ;
35
39
You can’t perform that action at this time.
0 commit comments