refactor: match KlerosLiquid ABI (xdai-->eth)

Author: fnanni-0

contracts/kleros/xKlerosLiquid.sol

@@ -138,9 +138,9 @@ contract xKlerosLiquid is Initializable, TokenController, Arbitrator {
      *  @param _address The juror affected.
      *  @param _disputeID The ID of the dispute.
      *  @param _tokenAmount The amount of tokens won or lost.
-     *  @param _xDaiAmount The amount of xDai won or lost.
+     *  @param _ETHAmount The amount of xDai won or lost.
      */
-    event TokenAndETHShift(address indexed _address, uint indexed _disputeID, int _tokenAmount, int _xDaiAmount);
+    event TokenAndETHShift(address indexed _address, uint indexed _disputeID, int _tokenAmount, int _ETHAmount);
 
     /* Storage */
 
@@ -164,7 +164,6 @@ contract xKlerosLiquid is Initializable, TokenController, Arbitrator {
     uint public maxDrawingTime; // The maximum drawing time.
     // True if insolvent (`balance < stakedTokens || balance < lockedTokens`) token transfers should be blocked. Used to avoid blocking penalties.
     bool public lockInsolventTransfers;
-    uint public totalStake; 
     // General Storage
     Court[] public courts; // The subcourts.
     using SortitionSumTreeFactory for SortitionSumTreeFactory.SortitionSumTrees; // Use library functions for sortition sum trees.
@@ -577,9 +576,9 @@ contract xKlerosLiquid is Initializable, TokenController, Arbitrator {
      *  @param _disputeID The ID of the dispute.
      *  @param _appeal The appeal.
      *  @return tokenReward The token reward.
-     *  @return xDaiReward The xDai reward.
+     *  @return ETHReward The xDai reward.
      */
-    function computeTokenAndETHRewards(uint _disputeID, uint _appeal) private view returns(uint tokenReward, uint xDaiReward) {
+    function computeTokenAndETHRewards(uint _disputeID, uint _appeal) private view returns(uint tokenReward, uint ETHReward) {
         Dispute storage dispute = disputes[_disputeID];
 
         // Distribute penalties and arbitration fees.
@@ -588,17 +587,17 @@ contract xKlerosLiquid is Initializable, TokenController, Arbitrator {
             uint activeCount = dispute.votesInEachRound[_appeal];
             if (activeCount > 0) {
                 tokenReward = dispute.penaltiesInEachRound[_appeal] / activeCount;
-                xDaiReward = dispute.totalFeesForJurors[_appeal] / activeCount;
+                ETHReward = dispute.totalFeesForJurors[_appeal] / activeCount;
             } else {
                 tokenReward = 0;
-                xDaiReward = 0;
+                ETHReward = 0;
             }
         } else {
             // Distribute penalties and fees evenly between coherent jurors.
             uint winningChoice = dispute.voteCounters[dispute.voteCounters.length - 1].winningChoice;
             uint coherentCount = dispute.voteCounters[_appeal].counts[winningChoice];
             tokenReward = dispute.penaltiesInEachRound[_appeal] / coherentCount;
-            xDaiReward = dispute.totalFeesForJurors[_appeal] / coherentCount;
+            ETHReward = dispute.totalFeesForJurors[_appeal] / coherentCount;
         }
     }
 

contracts/kleros/KlerosLiquidExtraViews.sol renamed to contracts/kleros/xKlerosLiquidExtraViews.sol

@@ -1,6 +1,6 @@
 /**
  *  https://contributing.kleros.io/smart-contract-workflow
- *  @reviewers: []
+ *  @reviewers: [@hbarcelos]
  *  @auditors: []
  *  @bounties: []
  *  @deployments: []
@@ -10,19 +10,19 @@ pragma solidity ^0.4.24;
 import { xKlerosLiquid } from "./xKlerosLiquid.sol";
 
 /**
- *  @title KlerosLiquidExtraViews
- *  @author Enrique Piqueras - <epiquerass@gmail.com>
- *  @dev Extra view functions for KlerosLiquid. Not part of bug bounty.
+ *  @title xKlerosLiquidExtraViews
+ *  @dev This contract is an adaption of Mainnet's xKlerosLiquidExtraViews (https://github.com/kleros/kleros/blob/69cfbfb2128c29f1625b3a99a3183540772fda08/contracts/kleros/KlerosLiquidExtraViews.sol)
+ *  for xDai chain.
  */
-contract KlerosLiquidExtraViews {
+contract xKlerosLiquidExtraViews {
     /* Storage */
 
     xKlerosLiquid public klerosLiquid;
 
     /* Constructor */
 
-    /** @dev Constructs the KlerosLiquidExtraViews contract.
-     *  @param _klerosLiquid The address of KlerosLiquid.
+    /** @dev Constructs the xKlerosLiquidExtraViews contract.
+     *  @param _klerosLiquid The address of KlerosLiquid on xDai.
      */
     constructor(xKlerosLiquid _klerosLiquid) public {
         klerosLiquid = _klerosLiquid;

test/kleros/kleros-liquid.js

@@ -544,7 +544,7 @@ contract('xKlerosLiquid', (accounts) => {
             expect(
               tokensShiftEvents
                 .reduce(
-                  (acc, e) => acc.add(e.args._xDaiAmount),
+                  (acc, e) => acc.add(e.args._ETHAmount),
                   web3.utils.toBN(0)
                 )
                 .toNumber()
@@ -1044,6 +1044,7 @@ contract('xKlerosLiquid', (accounts) => {
     const ETHAfter = web3.utils.toBN(await web3.eth.getBalance(partyB))
     expect(ETHAfter.gt(ETHBefore)).to.equal(true)
   })
+
   it('Should handle invalid extra data.', async () => {
     const disputeID = 0
     const extraData = `0x${(1000).toString(16).padStart(64, '0')}${(0)
@@ -1072,4 +1073,5 @@ contract('xKlerosLiquid', (accounts) => {
       web3.utils.toBN(3)
     )
   })
+
 })