fix: evidences -> evidence

kleros · Jun 5, 2018 · 60d00ea · 60d00ea
1 parent 9c7b813
commit 60d00ea
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 17 deletions.
diff --git a/src/contracts/abstractions/Arbitrable.js b/src/contracts/abstractions/Arbitrable.js
@@ -121,14 +121,14 @@ class ArbitrableContract extends AbstractContract {
     )
 
     const partyAEvidence = (partyAContractData
-      ? partyAContractData.evidences
+      ? partyAContractData.evidence
       : []
     ).map(evidence => {
       evidence.submitter = arbitrableContractData.partyA
       return evidence
     })
     const partyBEvidence = (partyBContractData
-      ? partyBContractData.evidences
+      ? partyBContractData.evidence
       : []
     ).map(evidence => {
       evidence.submitter = arbitrableContractData.partyB

diff --git a/src/resources/Disputes.js b/src/resources/Disputes.js
@@ -114,13 +114,17 @@ class Disputes {
   // **************************** //
   /**
    * Fetch the shared dispute data from the store.
+   * @param {string} account - The users account.
    * @param {string} disputeId - The index of the dispute.
    * @returns {Promise} The dispute data in the store.
    */
-  getDisputeFromStore = disputeId => {
+  getDisputeFromStore = (account, disputeId) => {
     const arbitratorAddress = this._ArbitratorInstance.getContractAddress()
-
-    return this._StoreProviderInstance.getDispute(arbitratorAddress, disputeId)
+    return this._StoreProviderInstance.getDispute(
+      account,
+      arbitratorAddress,
+      disputeId
+    )
   }
 
   /**

diff --git a/tests/integration/disputeResolution.test.js b/tests/integration/disputeResolution.test.js
@@ -343,7 +343,7 @@ describe('Dispute Resolution', () => {
         expect(web3.eth.getBalance(partyA).toNumber()).toEqual(partyABalance)
       }
 
-      const netPNK = await KlerosPOCInstance.getNetTokensForDispute(0, partyA)
+      // const netPNK = await KlerosPOCInstance.getNetTokensForDispute(0, partyA)
 
       const updatedContractData = await ArbitrableTransactionInstance.getData()
       expect(parseInt(updatedContractData.status, 10)).toEqual(4)

diff --git a/tests/unit/contracts/abstractions/Arbitrable.test.js b/tests/unit/contracts/abstractions/Arbitrable.test.js
@@ -29,14 +29,14 @@ describe('ArbitrableContract', async () => {
       const mockGetContractByAddress = jest.fn()
       // return partyA then partyB contract
       mockGetContractByAddress.mockReturnValueOnce({
-        evidences: [
+        evidence: [
           {
             name: 'testPartyA'
           }
         ]
       })
       mockGetContractByAddress.mockReturnValueOnce({
-        evidences: [
+        evidence: [
           {
             name: 'testPartyB'
           }
@@ -70,7 +70,7 @@ describe('ArbitrableContract', async () => {
       const mockGetContractByAddress = jest.fn()
       // return partyA then partyB contract
       mockGetContractByAddress.mockReturnValueOnce({
-        evidences: [
+        evidence: [
           {
             name: 'testPartyA'
           }

diff --git a/tests/unit/resources/Disputes.test.js b/tests/unit/resources/Disputes.test.js
@@ -68,10 +68,12 @@ describe('Disputes', () => {
         currentRulingForDispute: jest.fn().mockReturnValue(0),
         canRuleDispute: jest.fn().mockReturnValue(false),
         getContractAddress: jest.fn().mockReturnValue(arbitratorAddress),
-        getDisputeCreationEvent: jest.fn().mockReturnValue({blockNumber: 1}),
+        getDisputeCreationEvent: jest.fn().mockReturnValue({ blockNumber: 1 }),
         getNetTokensForDispute: jest.fn().mockReturnValue(0),
         getAppealRuledAtTimestamps: jest.fn().mockReturnValue(appealRuledAt),
-        getDisputeDeadlineTimestamps: jest.fn().mockReturnValue(appealDeadlines),
+        getDisputeDeadlineTimestamps: jest
+          .fn()
+          .mockReturnValue(appealDeadlines),
         getAppealCreationTimestamps: jest.fn().mockReturnValue(appealCreatedAt)
       }
       disputesInstance._ArbitratorInstance = mockArbitrator
@@ -161,10 +163,12 @@ describe('Disputes', () => {
         currentRulingForDispute: jest.fn().mockReturnValue(2),
         canRuleDispute: jest.fn().mockReturnValue(true),
         getContractAddress: jest.fn().mockReturnValue(arbitratorAddress),
-        getDisputeCreationEvent: jest.fn().mockReturnValue({blockNumber: 1}),
+        getDisputeCreationEvent: jest.fn().mockReturnValue({ blockNumber: 1 }),
         getNetTokensForDispute: jest.fn().mockReturnValue(0),
         getAppealRuledAtTimestamps: jest.fn().mockReturnValue(appealRuledAt),
-        getDisputeDeadlineTimestamps: jest.fn().mockReturnValue(appealDeadlines),
+        getDisputeDeadlineTimestamps: jest
+          .fn()
+          .mockReturnValue(appealDeadlines),
         getAppealCreationTimestamps: jest.fn().mockReturnValue(appealCreatedAt)
       }
       disputesInstance._ArbitratorInstance = mockArbitrator
@@ -274,10 +278,12 @@ describe('Disputes', () => {
         currentRulingForDispute: jest.fn().mockReturnValue(2),
         canRuleDispute: jest.fn().mockReturnValue(false),
         getContractAddress: jest.fn().mockReturnValue(arbitratorAddress),
-        getDisputeCreationEvent: jest.fn().mockReturnValue({blockNumber: 1}),
+        getDisputeCreationEvent: jest.fn().mockReturnValue({ blockNumber: 1 }),
         getNetTokensForDispute: jest.fn().mockReturnValue(0),
         getAppealRuledAtTimestamps: jest.fn().mockReturnValue(appealRuledAt),
-        getDisputeDeadlineTimestamps: jest.fn().mockReturnValue(appealDeadlines),
+        getDisputeDeadlineTimestamps: jest
+          .fn()
+          .mockReturnValue(appealDeadlines),
         getAppealCreationTimestamps: jest.fn().mockReturnValue(appealCreatedAt)
       }
       disputesInstance._ArbitratorInstance = mockArbitrator
@@ -389,10 +395,12 @@ describe('Disputes', () => {
         currentRulingForDispute: jest.fn().mockReturnValue(2),
         canRuleDispute: jest.fn().mockReturnValue(false),
         getContractAddress: jest.fn().mockReturnValue(arbitratorAddress),
-        getDisputeCreationEvent: jest.fn().mockReturnValue({blockNumber: 1}),
+        getDisputeCreationEvent: jest.fn().mockReturnValue({ blockNumber: 1 }),
         getNetTokensForDispute: jest.fn().mockReturnValue(0),
         getAppealRuledAtTimestamps: jest.fn().mockReturnValue(appealRuledAt),
-        getDisputeDeadlineTimestamps: jest.fn().mockReturnValue(appealDeadlines),
+        getDisputeDeadlineTimestamps: jest
+          .fn()
+          .mockReturnValue(appealDeadlines),
         getAppealCreationTimestamps: jest.fn().mockReturnValue(appealCreatedAt)
       }
       disputesInstance._ArbitratorInstance = mockArbitrator