Skip to content

Commit 01fd5a8

Browse files
chrisethchriseth
committed
Add emit keyword to compilation tests.
1 parent b9d0352 commit 01fd5a8

43 files changed

Lines changed: 120 additions & 120 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎test/compilationTests/MultiSigWallet/Factory.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,6 @@ contract Factory {
2323
{
2424
isInstantiation[instantiation] = true;
2525
instantiations[msg.sender].push(instantiation);
26-
ContractInstantiation(msg.sender, instantiation);
26+
emit ContractInstantiation(msg.sender, instantiation);
2727
}
2828
}

‎test/compilationTests/MultiSigWallet/MultiSigWallet.sol‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ contract MultiSigWallet {
9393
payable
9494
{
9595
if (msg.value > 0)
96-
Deposit(msg.sender, msg.value);
96+
emit Deposit(msg.sender, msg.value);
9797
}
9898

9999
/*
@@ -126,7 +126,7 @@ contract MultiSigWallet {
126126
{
127127
isOwner[owner] = true;
128128
owners.push(owner);
129-
OwnerAddition(owner);
129+
emit OwnerAddition(owner);
130130
}
131131

132132
/// @dev Allows to remove an owner. Transaction has to be sent by wallet.
@@ -145,7 +145,7 @@ contract MultiSigWallet {
145145
owners.length -= 1;
146146
if (required > owners.length)
147147
changeRequirement(owners.length);
148-
OwnerRemoval(owner);
148+
emit OwnerRemoval(owner);
149149
}
150150

151151
/// @dev Allows to replace an owner with a new owner. Transaction has to be sent by wallet.
@@ -164,8 +164,8 @@ contract MultiSigWallet {
164164
}
165165
isOwner[owner] = false;
166166
isOwner[newOwner] = true;
167-
OwnerRemoval(owner);
168-
OwnerAddition(newOwner);
167+
emit OwnerRemoval(owner);
168+
emit OwnerAddition(newOwner);
169169
}
170170

171171
/// @dev Allows to change the number of required confirmations. Transaction has to be sent by wallet.
@@ -176,7 +176,7 @@ contract MultiSigWallet {
176176
validRequirement(owners.length, _required)
177177
{
178178
required = _required;
179-
RequirementChange(_required);
179+
emit RequirementChange(_required);
180180
}
181181

182182
/// @dev Allows an owner to submit and confirm a transaction.
@@ -201,7 +201,7 @@ contract MultiSigWallet {
201201
notConfirmed(transactionId, msg.sender)
202202
{
203203
confirmations[transactionId][msg.sender] = true;
204-
Confirmation(msg.sender, transactionId);
204+
emit Confirmation(msg.sender, transactionId);
205205
executeTransaction(transactionId);
206206
}
207207

@@ -214,7 +214,7 @@ contract MultiSigWallet {
214214
notExecuted(transactionId)
215215
{
216216
confirmations[transactionId][msg.sender] = false;
217-
Revocation(msg.sender, transactionId);
217+
emit Revocation(msg.sender, transactionId);
218218
}
219219

220220
/// @dev Allows anyone to execute a confirmed transaction.
@@ -227,9 +227,9 @@ contract MultiSigWallet {
227227
Transaction tx = transactions[transactionId];
228228
tx.executed = true;
229229
if (tx.destination.call.value(tx.value)(tx.data))
230-
Execution(transactionId);
230+
emit Execution(transactionId);
231231
else {
232-
ExecutionFailure(transactionId);
232+
emit ExecutionFailure(transactionId);
233233
tx.executed = false;
234234
}
235235
}
@@ -273,7 +273,7 @@ contract MultiSigWallet {
273273
executed: false
274274
});
275275
transactionCount += 1;
276-
Submission(transactionId);
276+
emit Submission(transactionId);
277277
}
278278

279279
/*

‎test/compilationTests/MultiSigWallet/MultiSigWalletWithDailyLimit.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ contract MultiSigWalletWithDailyLimit is MultiSigWallet {
3333
onlyWallet
3434
{
3535
dailyLimit = _dailyLimit;
36-
DailyLimitChange(_dailyLimit);
36+
emit DailyLimitChange(_dailyLimit);
3737
}
3838

3939
/// @dev Allows anyone to execute a confirmed transaction or ether withdraws until daily limit is reached.
@@ -49,9 +49,9 @@ contract MultiSigWalletWithDailyLimit is MultiSigWallet {
4949
if (!confirmed)
5050
spentToday += tx.value;
5151
if (tx.destination.call.value(tx.value)(tx.data))
52-
Execution(transactionId);
52+
emit Execution(transactionId);
5353
else {
54-
ExecutionFailure(transactionId);
54+
emit ExecutionFailure(transactionId);
5555
tx.executed = false;
5656
if (!confirmed)
5757
spentToday -= tx.value;

‎test/compilationTests/MultiSigWallet/TestToken.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ contract TestToken {
3131
}
3232
balances[msg.sender] -= _value;
3333
balances[_to] += _value;
34-
Transfer(msg.sender, _to, _value);
34+
emit Transfer(msg.sender, _to, _value);
3535
return true;
3636
}
3737

@@ -45,7 +45,7 @@ contract TestToken {
4545
balances[_to] += _value;
4646
balances[_from] -= _value;
4747
allowed[_from][msg.sender] -= _value;
48-
Transfer(_from, _to, _value);
48+
emit Transfer(_from, _to, _value);
4949
return true;
5050
}
5151

@@ -54,7 +54,7 @@ contract TestToken {
5454
returns (bool success)
5555
{
5656
allowed[msg.sender][_spender] = _value;
57-
Approval(msg.sender, _spender, _value);
57+
emit Approval(msg.sender, _spender, _value);
5858
return true;
5959
}
6060

‎test/compilationTests/corion/ico.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ contract ico is safeMath {
337337
token(tokenAddr).mint(affilateAddress, extra);
338338
}
339339
checkPremium(beneficiaryAddress);
340-
EICO(beneficiaryAddress, _reward, affilateAddress, extra);
340+
emit EICO(beneficiaryAddress, _reward, affilateAddress, extra);
341341
return true;
342342
}
343343

‎test/compilationTests/corion/premium.sol‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ contract premium is module, safeMath {
6363
for ( uint256 a=0 ; a<genesisAddr.length ; a++ ) {
6464
genesis[genesisAddr[a]] = true;
6565
require( db.increase(genesisAddr[a], genesisValue[a]) );
66-
Mint(genesisAddr[a], genesisValue[a]);
66+
emit Mint(genesisAddr[a], genesisValue[a]);
6767
}
6868
}
6969
}
@@ -137,7 +137,7 @@ contract premium is module, safeMath {
137137
require( msg.sender != spender );
138138
require( db.balanceOf(msg.sender) >= amount );
139139
require( db.setAllowance(msg.sender, spender, amount, nonce) );
140-
Approval(msg.sender, spender, amount);
140+
emit Approval(msg.sender, spender, amount);
141141
}
142142

143143
function allowance(address owner, address spender) constant returns (uint256 remaining, uint256 nonce) {
@@ -178,7 +178,7 @@ contract premium is module, safeMath {
178178
} else {
179179
_transfer(msg.sender, to, amount);
180180
}
181-
Transfer(msg.sender, to, amount, _data);
181+
emit Transfer(msg.sender, to, amount, _data);
182182
return true;
183183
}
184184

@@ -207,15 +207,15 @@ contract premium is module, safeMath {
207207
_reamining = safeSub(_reamining, amount);
208208
_nonce = safeAdd(_nonce, 1);
209209
require( db.setAllowance(from, msg.sender, _reamining, _nonce) );
210-
AllowanceUsed(msg.sender, from, amount);
210+
emit AllowanceUsed(msg.sender, from, amount);
211211
}
212212
bytes memory _data;
213213
if ( isContract(to) ) {
214214
transferToContract(from, to, amount, _data);
215215
} else {
216216
_transfer( from, to, amount);
217217
}
218-
Transfer(from, to, amount, _data);
218+
emit Transfer(from, to, amount, _data);
219219
return true;
220220
}
221221

@@ -242,7 +242,7 @@ contract premium is module, safeMath {
242242
} else {
243243
_transfer( msg.sender, to, amount);
244244
}
245-
Transfer(msg.sender, to, amount, extraData);
245+
emit Transfer(msg.sender, to, amount, extraData);
246246
return true;
247247
}
248248

@@ -301,7 +301,7 @@ contract premium is module, safeMath {
301301
@value Amount
302302
*/
303303
require( db.increase(owner, value) );
304-
Mint(owner, value);
304+
emit Mint(owner, value);
305305
}
306306

307307
function isContract(address addr) internal returns (bool success) {

‎test/compilationTests/corion/provider.sol‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ contract provider is module, safeMath, announcementTypes {
268268
} else {
269269
delete providers[msg.sender].data[currHeight].supply[currentSchellingRound];
270270
}
271-
EProviderOpen(msg.sender, currHeight);
271+
emit EProviderOpen(msg.sender, currHeight);
272272
}
273273
function setProviderDetails(address addr, string website, string country, string info, uint8 rate, address admin) isReady external {
274274
/*
@@ -297,7 +297,7 @@ contract provider is module, safeMath, announcementTypes {
297297
providers[addr].data[currHeight].country = country;
298298
providers[addr].data[currHeight].info = info;
299299
providers[addr].data[currHeight].currentRate = rate;
300-
EProviderDetailsChanged(addr, currHeight, website, country, info, rate, admin);
300+
emit EProviderDetailsChanged(addr, currHeight, website, country, info, rate, admin);
301301
}
302302
function getProviderInfo(address addr, uint256 height) public constant returns (string name, string website, string country, string info, uint256 create) {
303303
/*
@@ -367,7 +367,7 @@ contract provider is module, safeMath, announcementTypes {
367367
providers[msg.sender].data[currHeight].valid = false;
368368
providers[msg.sender].data[currHeight].close = currentSchellingRound;
369369
setRightForInterest(getProviderCurrentSupply(msg.sender), 0, providers[msg.sender].data[currHeight].priv);
370-
EProviderClose(msg.sender, currHeight);
370+
emit EProviderClose(msg.sender, currHeight);
371371
}
372372
function allowUsers(address provider, address[] addr) isReady external {
373373
/*
@@ -437,7 +437,7 @@ contract provider is module, safeMath, announcementTypes {
437437
clients[msg.sender].paidUpTo = currentSchellingRound;
438438
clients[msg.sender].lastRate = providers[provider].data[currHeight].currentRate;
439439
clients[msg.sender].providerConnected = now;
440-
ENewClient(msg.sender, provider, currHeight, bal);
440+
emit ENewClient(msg.sender, provider, currHeight, bal);
441441
}
442442
function partProvider() isReady external {
443443
/*
@@ -467,7 +467,7 @@ contract provider is module, safeMath, announcementTypes {
467467
delete clients[msg.sender].paidUpTo;
468468
delete clients[msg.sender].lastRate;
469469
delete clients[msg.sender].providerConnected;
470-
EClientLost(msg.sender, provider, currHeight, bal);
470+
emit EClientLost(msg.sender, provider, currHeight, bal);
471471
}
472472
function checkReward(address addr) public constant returns (uint256 reward) {
473473
/*
@@ -522,7 +522,7 @@ contract provider is module, safeMath, announcementTypes {
522522
if ( providerReward > 0 ) {
523523
require( moduleHandler(moduleHandlerAddress).transfer(address(this), provider, providerReward, false) );
524524
}
525-
EReward(msg.sender, provider, clientReward, providerReward);
525+
emit EReward(msg.sender, provider, clientReward, providerReward);
526526
}
527527
function getClientReward(uint256 limit) internal returns (uint256 reward) {
528528
/*

‎test/compilationTests/corion/publisher.sol‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ contract publisher is announcementTypes, module, safeMath {
148148
announcements[announcementsLength]._str = _str;
149149
announcements[announcementsLength]._uint = _uint;
150150
announcements[announcementsLength]._addr = _addr;
151-
ENewAnnouncement(announcementsLength, Type);
151+
emit ENewAnnouncement(announcementsLength, Type);
152152
}
153153

154154
function closeAnnouncement(uint256 id) onlyOwner external {
@@ -238,7 +238,7 @@ contract publisher is announcementTypes, module, safeMath {
238238
opponents[msg.sender].push(id);
239239
}
240240
announcements[id].oppositionWeight += _balance;
241-
EOppositeAnnouncement(id, msg.sender, _balance);
241+
emit EOppositeAnnouncement(id, msg.sender, _balance);
242242
}
243243

244244
function invalidateAnnouncement(uint256 id) onlyOwner external {
@@ -250,7 +250,7 @@ contract publisher is announcementTypes, module, safeMath {
250250
require( announcements[id].open );
251251
announcements[id].end = block.number;
252252
announcements[id].open = false;
253-
EInvalidateAnnouncement(id);
253+
emit EInvalidateAnnouncement(id);
254254
}
255255

256256
modifier onlyOwner() {

‎test/compilationTests/corion/token.sol‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ contract token is safeMath, module, announcementTypes {
7878
genesis[genesisAddr[a]] = true;
7979
require( db.increase(genesisAddr[a], genesisValue[a]) );
8080
if ( ! genesisAddr[a].send(0.2 ether) ) {}
81-
Mint(genesisAddr[a], genesisValue[a]);
81+
emit Mint(genesisAddr[a], genesisValue[a]);
8282
}
8383
}
8484
}
@@ -152,7 +152,7 @@ contract token is safeMath, module, announcementTypes {
152152
require( msg.sender != spender );
153153
require( db.balanceOf(msg.sender) >= amount );
154154
require( db.setAllowance(msg.sender, spender, amount, nonce) );
155-
Approval(msg.sender, spender, amount);
155+
emit Approval(msg.sender, spender, amount);
156156
}
157157

158158
function allowance(address owner, address spender) constant returns (uint256 remaining, uint256 nonce) {
@@ -193,7 +193,7 @@ contract token is safeMath, module, announcementTypes {
193193
} else {
194194
_transfer( msg.sender, to, amount, true);
195195
}
196-
Transfer(msg.sender, to, amount, _data);
196+
emit Transfer(msg.sender, to, amount, _data);
197197
return true;
198198
}
199199

@@ -222,15 +222,15 @@ contract token is safeMath, module, announcementTypes {
222222
_reamining = safeSub(_reamining, amount);
223223
_nonce = safeAdd(_nonce, 1);
224224
require( db.setAllowance(from, msg.sender, _reamining, _nonce) );
225-
AllowanceUsed(msg.sender, from, amount);
225+
emit AllowanceUsed(msg.sender, from, amount);
226226
}
227227
bytes memory _data;
228228
if ( isContract(to) ) {
229229
_transferToContract(from, to, amount, _data);
230230
} else {
231231
_transfer( from, to, amount, true);
232232
}
233-
Transfer(from, to, amount, _data);
233+
emit Transfer(from, to, amount, _data);
234234
return true;
235235
}
236236

@@ -256,7 +256,7 @@ contract token is safeMath, module, announcementTypes {
256256
bytes memory _data;
257257
require( super.isModuleHandler(msg.sender) );
258258
_transfer( from, to, amount, fee);
259-
Transfer(from, to, amount, _data);
259+
emit Transfer(from, to, amount, _data);
260260
return true;
261261
}
262262

@@ -284,7 +284,7 @@ contract token is safeMath, module, announcementTypes {
284284
} else {
285285
_transfer( msg.sender, to, amount, true);
286286
}
287-
Transfer(msg.sender, to, amount, extraData);
287+
emit Transfer(msg.sender, to, amount, extraData);
288288
return true;
289289
}
290290

@@ -379,7 +379,7 @@ contract token is safeMath, module, announcementTypes {
379379
require( db.increase(_schellingAddr, _forSchelling) );
380380
_burn(owner, _forBurn);
381381
bytes memory _data;
382-
Transfer(owner, _schellingAddr, _forSchelling, _data);
382+
emit Transfer(owner, _schellingAddr, _forSchelling, _data);
383383
require( moduleHandler(moduleHandlerAddress).broadcastTransfer(owner, _schellingAddr, _forSchelling) );
384384
} else {
385385
_burn(owner, _fee);
@@ -428,7 +428,7 @@ contract token is safeMath, module, announcementTypes {
428428
if ( isICO ) {
429429
require( ico(icoAddr).setInterestDB(owner, db.balanceOf(owner)) );
430430
}
431-
Mint(owner, value);
431+
emit Mint(owner, value);
432432
}
433433

434434
function burn(address owner, uint256 value) isReady external returns (bool success) {
@@ -454,7 +454,7 @@ contract token is safeMath, module, announcementTypes {
454454
*/
455455
require( db.decrease(owner, value) );
456456
require( moduleHandler(moduleHandlerAddress).broadcastTransfer(owner, address(0x00), value) );
457-
Burn(owner, value);
457+
emit Burn(owner, value);
458458
}
459459

460460
function isContract(address addr) internal returns (bool success) {

‎test/compilationTests/gnosis/Events/CategoricalEvent.sol‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ contract CategoricalEvent is Event {
3838
outcomeTokens[uint(outcome)].revoke(msg.sender, winnings);
3939
// Payout winnings
4040
require(collateralToken.transfer(msg.sender, winnings));
41-
WinningsRedemption(msg.sender, winnings);
41+
emit WinningsRedemption(msg.sender, winnings);
4242
}
4343

4444
/// @dev Calculates and returns event hash

0 commit comments

Comments
 (0)