Merge pull request #180 from kleros/fix/get_evidences

fix(evidences): get evidences
kleros · Oct 3, 2018 · e86d176 · e86d176
2 parents a03d087 + f69dc5e
commit e86d176
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/src/contracts/implementations/arbitrable/Arbitrable.js b/src/contracts/implementations/arbitrable/Arbitrable.js
@@ -56,15 +56,7 @@ class Arbitrable extends ContractImplementation {
    * Get the evidence submitted in a dispute.
    * @returns {object[]} An array of evidence objects.
    */
-  getEvidence = async () => {
-    await this.loadContract()
-    const arbitratorAddress = await this.contractInstance.arbitrator()
-    await this.loadContract()
-    const disputeID = (await this.contractInstance.disputeID()).toNumber()
-
-    // No evidence yet as there is no dispute
-    if (_.isNull(disputeID)) return []
-
+  getEvidence = async (arbitratorAddress, disputeID = 0) => {
     const evidenceLogs = await EventListener.getEventLogs(
       this,
       'Evidence',

diff --git a/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js b/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js
@@ -339,7 +339,11 @@ class MultipleArbitrableTransaction extends Arbitrable {
       buyerFee: this._Web3Wrapper.fromWei(arbitrableTransaction[8], 'ether'),
       lastInteraction: arbitrableTransaction[9].toNumber(),
       status: arbitrableTransaction[10].toNumber(),
-      metaEvidence: await this.getMetaEvidence(arbitrableTransactionId)
+      metaEvidence: await this.getMetaEvidence(arbitrableTransactionId),
+      evidence: await this.getEvidence(
+        arbitrableTransaction[5],
+        arbitrableTransaction[4].toNumber()
+      )
     }
   }
 }