Skip to content

Commit b9d0352

Browse files
chrisethchriseth
committed
Add some more emits.
1 parent 80b7d36 commit b9d0352

3 files changed

Lines changed: 22 additions & 22 deletions

File tree

‎test/contracts/AuctionRegistrar.cpp‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ contract AuctionSystem {
7070
var auction = m_auctions[_name];
7171
if (auction.endDate > 0 && now > auction.endDate)
7272
{
73-
AuctionEnded(_name, auction.highestBidder);
73+
emit AuctionEnded(_name, auction.highestBidder);
7474
onAuctionEnd(_name);
7575
delete m_auctions[_name];
7676
return;
@@ -84,7 +84,7 @@ contract AuctionSystem {
8484
auction.highestBidder = _bidder;
8585
auction.endDate = now + c_biddingTime;
8686
87-
NewBid(_name, _bidder, _value);
87+
emit NewBid(_name, _bidder, _value);
8888
}
8989
}
9090
@@ -122,7 +122,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
122122
var previousOwner = record.owner;
123123
record.renewalDate = now + c_renewalInterval;
124124
record.owner = auction.highestBidder;
125-
Changed(_name);
125+
emit Changed(_name);
126126
if (previousOwner != 0x0000000000000000000000000000000000000000) {
127127
if (!record.owner.send(auction.sumOfBids - auction.highestBid / 100))
128128
throw;
@@ -146,7 +146,7 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
146146
if (record.owner != 0x0000000000000000000000000000000000000000)
147147
throw;
148148
m_toRecord[_name].owner = msg.sender;
149-
Changed(_name);
149+
emit Changed(_name);
150150
}
151151
}
152152
@@ -158,17 +158,17 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
158158
159159
function transfer(string _name, address _newOwner) onlyrecordowner(_name) {
160160
m_toRecord[_name].owner = _newOwner;
161-
Changed(_name);
161+
emit Changed(_name);
162162
}
163163
164164
function disown(string _name) onlyrecordowner(_name) {
165165
if (stringsEqual(m_toName[m_toRecord[_name].primary], _name))
166166
{
167-
PrimaryChanged(_name, m_toRecord[_name].primary);
167+
emit PrimaryChanged(_name, m_toRecord[_name].primary);
168168
m_toName[m_toRecord[_name].primary] = "";
169169
}
170170
delete m_toRecord[_name];
171-
Changed(_name);
171+
emit Changed(_name);
172172
}
173173
174174
function setAddress(string _name, address _a, bool _primary) onlyrecordowner(_name) {
@@ -182,11 +182,11 @@ contract GlobalRegistrar is Registrar, AuctionSystem {
182182
}
183183
function setSubRegistrar(string _name, address _registrar) onlyrecordowner(_name) {
184184
m_toRecord[_name].subRegistrar = _registrar;
185-
Changed(_name);
185+
emit Changed(_name);
186186
}
187187
function setContent(string _name, bytes32 _content) onlyrecordowner(_name) {
188188
m_toRecord[_name].content = _content;
189-
Changed(_name);
189+
emit Changed(_name);
190190
}
191191
192192
function stringsEqual(string storage _a, string memory _b) internal returns (bool) {

‎test/contracts/FixedFeeRegistrar.cpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,30 +78,30 @@ contract FixedFeeRegistrar is Registrar {
7878
Record rec = m_record(_name);
7979
if (rec.owner == 0x0000000000000000000000000000000000000000 && msg.value >= c_fee) {
8080
rec.owner = msg.sender;
81-
Changed(_name);
81+
emit Changed(_name);
8282
}
8383
}
8484
function disown(string _name, address _refund) onlyrecordowner(_name) {
8585
delete m_recordData[uint(keccak256(_name)) / 8];
8686
if (!_refund.send(c_fee))
8787
throw;
88-
Changed(_name);
88+
emit Changed(_name);
8989
}
9090
function transfer(string _name, address _newOwner) onlyrecordowner(_name) {
9191
m_record(_name).owner = _newOwner;
92-
Changed(_name);
92+
emit Changed(_name);
9393
}
9494
function setAddr(string _name, address _a) onlyrecordowner(_name) {
9595
m_record(_name).addr = _a;
96-
Changed(_name);
96+
emit Changed(_name);
9797
}
9898
function setSubRegistrar(string _name, address _registrar) onlyrecordowner(_name) {
9999
m_record(_name).subRegistrar = _registrar;
100-
Changed(_name);
100+
emit Changed(_name);
101101
}
102102
function setContent(string _name, bytes32 _content) onlyrecordowner(_name) {
103103
m_record(_name).content = _content;
104-
Changed(_name);
104+
emit Changed(_name);
105105
}
106106
107107
function record(string _name) constant returns (address o_addr, address o_subRegistrar, bytes32 o_content, address o_owner) {

‎test/contracts/Wallet.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ contract multiowned {
123123
if (pending.ownersDone & ownerIndexBit > 0) {
124124
pending.yetNeeded++;
125125
pending.ownersDone -= ownerIndexBit;
126-
Revoke(msg.sender, _operation);
126+
emit Revoke(msg.sender, _operation);
127127
}
128128
}
129129
@@ -137,7 +137,7 @@ contract multiowned {
137137
m_owners[ownerIndex] = uint(_to);
138138
m_ownerIndex[uint(_from)] = 0;
139139
m_ownerIndex[uint(_to)] = ownerIndex;
140-
OwnerChanged(_from, _to);
140+
emit OwnerChanged(_from, _to);
141141
}
142142
143143
function addOwner(address _owner) onlymanyowners(keccak256(msg.data)) external {
@@ -151,7 +151,7 @@ contract multiowned {
151151
m_numOwners++;
152152
m_owners[m_numOwners] = uint(_owner);
153153
m_ownerIndex[uint(_owner)] = m_numOwners;
154-
OwnerAdded(_owner);
154+
emit OwnerAdded(_owner);
155155
}
156156
157157
function removeOwner(address _owner) onlymanyowners(keccak256(msg.data)) external {
@@ -163,14 +163,14 @@ contract multiowned {
163163
m_ownerIndex[uint(_owner)] = 0;
164164
clearPending();
165165
reorganizeOwners(); //make sure m_numOwner is equal to the number of owners and always points to the optimal free slot
166-
OwnerRemoved(_owner);
166+
emit OwnerRemoved(_owner);
167167
}
168168
169169
function changeRequirement(uint _newRequired) onlymanyowners(keccak256(msg.data)) external {
170170
if (_newRequired > m_numOwners) return;
171171
m_required = _newRequired;
172172
clearPending();
173-
RequirementChanged(_newRequired);
173+
emit RequirementChanged(_newRequired);
174174
}
175175
176176
function isOwner(address _addr) returns (bool) {
@@ -382,7 +382,7 @@ contract Wallet is multisig, multiowned, daylimit {
382382
function() payable {
383383
// just being sent some cash?
384384
if (msg.value > 0)
385-
Deposit(msg.sender, msg.value);
385+
emit Deposit(msg.sender, msg.value);
386386
}
387387
388388
// Outside-visible transact entry point. Executes transacion immediately if below daily spend limit.
@@ -403,7 +403,7 @@ contract Wallet is multisig, multiowned, daylimit {
403403
m_txs[_r].to = _to;
404404
m_txs[_r].value = _value;
405405
m_txs[_r].data = _data;
406-
ConfirmationNeeded(_r, msg.sender, _value, _to, _data);
406+
emit ConfirmationNeeded(_r, msg.sender, _value, _to, _data);
407407
}
408408
}
409409

0 commit comments

Comments
 (0)