Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(multiple-arbitrable-transaction): fix incompatible events #197

Merged
merged 2 commits into from
Dec 28, 2018
Merged

fix(multiple-arbitrable-transaction): fix incompatible events #197

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
277d6a1
fix(multiple-arbitrable-transaction): fix #196
0xferit Dec 26, 2018
144ffab
fix(multiple-arbitrable-transaction): fix #195
0xferit Dec 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions contracts/standard/arbitration/MultipleArbitrableTransaction.sol
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ contract MultipleArbitrableTransaction {
* @param _party The address of the party submiting the evidence. Note that 0 is kept for evidences not submitted by any party.
* @param _evidence A link to evidence or if it is short the evidence itself. Can be web link ("http://X"), IPFS ("ipfs:/X") or another storing service (using the URI, see https://en.wikipedia.org/wiki/Uniform_Resource_Identifier ). One usecase of short evidence is to include the hash of the plain English contract.
*/
event Evidence(Arbitrator indexed _arbitrator, uint indexed _disputeID, address _party, string _evidence);
event Evidence(Arbitrator indexed _arbitrator, uint indexed _disputeID, address indexed _party, string _evidence);

/** @dev To be emmited when a dispute is created to link the correct meta-evidence to the disputeID.
* @param _arbitrator The arbitrator of the contract.
Expand All @@ -76,12 +76,11 @@ contract MultipleArbitrableTransaction {
event Dispute(Arbitrator indexed _arbitrator, uint indexed _disputeID, uint _metaEvidenceID);

/** @dev To be raised when a ruling is given.
* @param _transactionID The index of the transaction in dispute.
* @param _arbitrator The arbitrator giving the ruling.
* @param _disputeID ID of the dispute in the Arbitrator contract.
* @param _ruling The ruling which was given.
*/
event Ruling(uint indexed _transactionID, Arbitrator indexed _arbitrator, uint indexed _disputeID, uint _ruling);
event Ruling(Arbitrator indexed _arbitrator, uint indexed _disputeID, uint _ruling);

// **************************** //
// * Arbitrable functions * //
Expand Down Expand Up @@ -292,7 +291,7 @@ contract MultipleArbitrableTransaction {
require(msg.sender == address(arbitrator), "The caller must be the arbitrator.");
require(transaction.status == Status.DisputeCreated, "The dispute has already been resolved.");

emit Ruling(transactionID, Arbitrator(msg.sender), _disputeID, _ruling);
emit Ruling(Arbitrator(msg.sender), _disputeID, _ruling);

executeRuling(transactionID, _ruling);
}
Expand Down