[fix] get meta-evidence uri

kleros · Sep 25, 2018 · 48f68f7 · 48f68f7
1 parent bf2df87
commit 48f68f7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/src/contracts/implementations/arbitrable/Arbitrable.js b/src/contracts/implementations/arbitrable/Arbitrable.js
@@ -27,8 +27,8 @@ class Arbitrable extends ContractImplementation {
    * @returns {object} The metaEvidence object
    */
   getMetaEvidence = async (metaEvidenceID = 0) => {
-    if (this.metaEvidenceCache[this.contractAddress])
-      return this.metaEvidenceCache[this.contractAddress]
+    if (this.metaEvidenceCache[metaEvidenceID])
+      return this.metaEvidenceCache[metaEvidenceID]
 
     const metaEvidenceLog = await EventListener.getEventLogs(
       this,
@@ -40,7 +40,16 @@ class Arbitrable extends ContractImplementation {
 
     if (!metaEvidenceLog[0]) return {} // NOTE better to throw errors for missing meta-evidence?
 
-    return metaEvidenceLog[0].args._evidence
+    const metaEvidenceUri = metaEvidenceLog[0].args._evidence
+    // FIXME caching issue need a query param to fetch from AWS
+    const metaEvidenceResponse = await httpRequest('GET', metaEvidenceUri)
+
+    if (metaEvidenceResponse.status >= 400)
+      throw new Error(`Unable to fetch meta-evidence at ${metaEvidenceUri}`)
+
+    this.metaEvidenceCache[metaEvidenceID] =
+      metaEvidenceResponse.body || metaEvidenceResponse
+    return metaEvidenceResponse.body || metaEvidenceResponse
   }
 
   /**

diff --git a/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js b/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js
@@ -87,11 +87,7 @@ class MultipleArbitrableTransaction extends Arbitrable {
    * @param {amount} amount - Part or all of the amount of the good or the service.
    * @returns {object} - The result transaction object.
    */
-  pay = async (
-    account,
-    arbitrableTransactionId,
-    amount
-  ) => {
+  pay = async (account, arbitrableTransactionId, amount) => {
     await this.loadContract()
 
     try {

diff --git a/tests/integration/contracts.test.js b/tests/integration/contracts.test.js
@@ -183,7 +183,6 @@ describe('Contracts', () => {
         expect(transactionArbitrable0.buyerFee).toEqual(0)
         expect(transactionArbitrable0.lastInteraction).toBeDefined()
         expect(transactionArbitrable0.status).toEqual(0)
-        expect(transactionArbitrable0.metaEvidenceUri).toEqual(arbitrableContractData.metaEvidenceUri)
       },
       10000
     )