Skip to content

Commit e2599fa

Browse files
committed
FeeRecipient event updated, and corresponding test
1 parent 428af6e commit e2599fa

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

contracts/standard/arbitration/MultipleArbitrableTransactionWithFee.sol

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ contract MultipleArbitrableTransactionWithFee is IArbitrable {
6262
* @param _transactionID The index of the transaction.
6363
* @param _amount The amount paid.
6464
*/
65-
event FeePayment(uint indexed _transactionID, uint _amount);
65+
event FeeRecipientPayment(uint indexed _transactionID, uint _amount);
6666

6767
/** @dev To be emitted when a feeRecipient is changed.
6868
* @param _oldFeeRecipient Previous feeRecipient.
@@ -180,7 +180,7 @@ contract MultipleArbitrableTransactionWithFee is IArbitrable {
180180
transaction.receiver.send(_amount - feeAmount);
181181

182182
emit Payment(_transactionID, _amount, msg.sender);
183-
emit FeePayment(_transactionID, feeAmount);
183+
emit FeeRecipientPayment(_transactionID, feeAmount);
184184
}
185185

186186
/** @dev Reimburse sender. To be called if the good or service can't be fully provided.
@@ -212,7 +212,7 @@ contract MultipleArbitrableTransactionWithFee is IArbitrable {
212212
feeRecipient.send(feeAmount);
213213
transaction.receiver.send(amount - feeAmount);
214214

215-
emit FeePayment(_transactionID, feeAmount);
215+
emit FeeRecipientPayment(_transactionID, feeAmount);
216216

217217
transaction.status = Status.Resolved;
218218
}
@@ -398,7 +398,7 @@ contract MultipleArbitrableTransactionWithFee is IArbitrable {
398398
feeRecipient.send(feeAmount);
399399
transaction.receiver.send(receiverArbitrationFee + amount - feeAmount);
400400

401-
emit FeePayment(_transactionID, feeAmount);
401+
emit FeeRecipientPayment(_transactionID, feeAmount);
402402
} else {
403403
uint split_arbitration = senderArbitrationFee / 2;
404404
uint split_amount = amount / 2;
@@ -408,7 +408,7 @@ contract MultipleArbitrableTransactionWithFee is IArbitrable {
408408
feeRecipient.send(feeAmount);
409409
transaction.receiver.send(split_arbitration + split_amount - feeAmount);
410410

411-
emit FeePayment(_transactionID, feeAmount);
411+
emit FeeRecipientPayment(_transactionID, feeAmount);
412412
}
413413

414414
transaction.status = Status.Resolved;

test/multiple-arbitrable-transaction-with-fee.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1407,7 +1407,7 @@ const {
14071407
}
14081408
)
14091409

1410-
assert.equal(tx.logs[0].event, 'FeePayment')
1410+
assert.equal(tx.logs[0].event, 'FeeRecipientPayment')
14111411
assert.equal(tx.logs[0].args._transactionID.toNumber(), arbitrableTransactionId)
14121412
assert.equal(tx.logs[0].args._amount, calculateFeeRecipientAmount(amount))
14131413
})

0 commit comments

Comments
 (0)