fix(kleros): get the current ruling

kleros · Nov 14, 2018 · b4a5adf · b4a5adf
1 parent b9f931c
commit b4a5adf
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "kleros-api-2",
-  "version": "0.18.11",
+  "version": "0.18.12",
   "description": "A Javascript library that makes it easy to build relayers and other DApps that use the Kleros protocol.",
   "keywords": [
     "Blockchain",

diff --git a/src/contracts/implementations/arbitrator/Kleros.js b/src/contracts/implementations/arbitrator/Kleros.js
@@ -449,16 +449,12 @@ class Kleros extends ContractImplementation {
   /**
    * Get number of jurors for a dispute.
    * @param {number} disputeID - Index of dispute.
-   * @param {number} appeal - Index of appeal.
    * @returns {number} - Int indicating the ruling of the dispute.
    */
-  currentRulingForDispute = async (disputeID, appeal) => {
+  currentRulingForDispute = async disputeID => {
     await this.loadContract()
 
-    const ruling = await this.contractInstance.getWinningChoice(
-      disputeID,
-      appeal
-    )
+    const ruling = await this.contractInstance.currentRuling(disputeID)
 
     return ruling.toNumber()
   }

diff --git a/src/resources/Disputes.js b/src/resources/Disputes.js
@@ -352,7 +352,7 @@ class Disputes {
       let canExecute = false
       let ruling
       const rulingPromises = [
-        this._ArbitratorInstance.currentRulingForDispute(disputeID, appeal)
+        this._ArbitratorInstance.currentRulingForDispute(disputeID)
       ]
 
       // Extra info for the last appeal

diff --git a/tests/unit/resources/Disputes.test.js b/tests/unit/resources/Disputes.test.js
@@ -167,7 +167,7 @@ describe('Disputes', () => {
         getDispute: mockArbitratorGetDispute,
         getPeriod: jest.fn().mockReturnValue(period),
         getSession: jest.fn().mockReturnValue(session),
-        currentRulingForDispute: jest.fn().mockReturnValue(2),
+        currentRulingForDispute: jest.fn().mockReturnValue(1),
         canRuleDispute: jest.fn().mockReturnValue(true),
         getContractAddress: jest.fn().mockReturnValue(arbitratorAddress),
         getDisputeCreationEvent: jest.fn().mockReturnValue({ blockNumber: 1 }),
@@ -287,7 +287,7 @@ describe('Disputes', () => {
         getDispute: mockArbitratorGetDispute,
         getPeriod: jest.fn().mockReturnValue(period),
         getSession: jest.fn().mockReturnValue(session),
-        currentRulingForDispute: jest.fn().mockReturnValue(2),
+        currentRulingForDispute: jest.fn().mockReturnValue(1),
         canRuleDispute: jest.fn().mockReturnValue(false),
         getContractAddress: jest.fn().mockReturnValue(arbitratorAddress),
         getDisputeCreationEvent: jest.fn().mockReturnValue({ blockNumber: 1 }),
@@ -404,7 +404,7 @@ describe('Disputes', () => {
         getDispute: mockArbitratorGetDispute,
         getPeriod: jest.fn().mockReturnValue(period),
         getSession: jest.fn().mockReturnValue(session),
-        currentRulingForDispute: jest.fn().mockReturnValue(2),
+        currentRulingForDispute: jest.fn().mockReturnValue(1),
         canRuleDispute: jest.fn().mockReturnValue(false),
         getContractAddress: jest.fn().mockReturnValue(arbitratorAddress),
         getDisputeCreationEvent: jest.fn().mockReturnValue({ blockNumber: 1 }),