test: add gas for test

kleros · Sep 12, 2018 · bc78a91 · bc78a91
1 parent a848a2f
commit bc78a91
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 31 deletions.
diff --git a/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js b/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js
@@ -62,18 +62,6 @@ class MultipleArbitrableTransaction extends Arbitrable {
     await this.loadContract()
 
     try {
-      const estimateGas = await this.contractInstance.createTransaction.estimateGas(
-        arbitratorAddress,
-        timeout,
-        seller,
-        arbitratorExtraData,
-        metaEvidenceUri,
-        {
-          from: account,
-          value: this._Web3Wrapper.toWei(value, 'ether')
-        }
-      )
-
       return this.contractInstance.createTransaction(
         arbitratorAddress,
         timeout,
@@ -82,8 +70,8 @@ class MultipleArbitrableTransaction extends Arbitrable {
         metaEvidenceUri,
         {
           from: account,
-          value: this._Web3Wrapper.toWei(value, 'ether'),
-          gas: estimateGas
+          value: value,
+          gas: process.env.GAS || undefined
         }
       )
     } catch (err) {
@@ -161,7 +149,7 @@ class MultipleArbitrableTransaction extends Arbitrable {
         arbitrableTransactionId,
         {
           from: account,
-          value: this._Web3Wrapper.toWei(arbitrationCost, 'ether')
+          value: arbitrationCost
         }
       )
     } catch (err) {
@@ -189,7 +177,8 @@ class MultipleArbitrableTransaction extends Arbitrable {
         arbitrableTransactionId,
         {
           from: account,
-          value: this._Web3Wrapper.toWei(arbitrationCost, 'ether')
+          value: arbitrationCost,
+          gas: process.env.GAS || undefined
         }
       )
     } catch (err) {
@@ -314,7 +303,7 @@ class MultipleArbitrableTransaction extends Arbitrable {
     try {
       return this.contractInstance.appeal(arbitrableTransactionId, extraData, {
         from: account,
-        value: this._Web3Wrapper.toWei(appealCost, 'ether')
+        value: appealCost
       })
     } catch (err) {
       console.error(err)

diff --git a/tests/integration/contracts.test.js b/tests/integration/contracts.test.js
@@ -154,13 +154,11 @@ describe('Contracts', () => {
 
         expect(klerosPOCAddress).toBeDefined()
         expect(arbitrableContractAddress).toBeDefined()
-
         // arbitrable contract
         const ArbitrableTransactionInstance = new MultipleArbitrableTransaction(
           provider,
           arbitrableContractAddress
         )
-
         await ArbitrableTransactionInstance.createArbitrableTransaction(
           arbitrableContractData.partyA,
           klerosPOCAddress,
@@ -170,7 +168,6 @@ describe('Contracts', () => {
           arbitrableContractData.extraData,
           arbitrableContractData.metaEvidenceUri
         )
-
         const transactionArbitrable0 = await ArbitrableTransactionInstance.getData(
           0
         )
@@ -204,13 +201,13 @@ describe('Contracts', () => {
         expect(klerosPOCAddress).toBeDefined()
         expect(arbitrableContractAddress).toBeDefined()
 
-        const ArbitrableTransactionInstanceInstance = new MultipleArbitrableTransaction(
+        const ArbitrableTransactionInstance = new MultipleArbitrableTransaction(
           provider,
           arbitrableContractAddress
         )
 
         // create a arbitrable transaction
-        await ArbitrableTransactionInstanceInstance.createArbitrableTransaction(
+        await ArbitrableTransactionInstance.createArbitrableTransaction(
           arbitrableContractData.partyA,
           klerosPOCAddress,
           arbitrableContractData.partyB,
@@ -221,7 +218,7 @@ describe('Contracts', () => {
         )
 
         // buyer pays the seller
-        const transactionArbitrable0 = await ArbitrableTransactionInstanceInstance.pay(
+        const transactionArbitrable0 = await ArbitrableTransactionInstance.pay(
           arbitrableContractData.partyA,
           0,
           arbitrableContractData.value
@@ -273,7 +270,7 @@ describe('Contracts', () => {
         const raiseDisputeByBuyerTxObj = await ArbitrableTransactionInstance.payArbitrationFeeByBuyer(
           arbitrableContractData.partyA,
           0,
-          web3.fromWei(arbitrationCost)
+          arbitrationCost
         )
 
         expect(raiseDisputeByBuyerTxObj.tx).toEqual(
@@ -355,7 +352,7 @@ describe('Contracts', () => {
         const raiseDisputeByBuyerTxObj = await ArbitrableTransactionInstance.payArbitrationFeeByBuyer(
           arbitrableContractData.partyA,
           0,
-          web3.fromWei(arbitrationCost).toNumber()
+          arbitrationCost
         )
 
         expect(raiseDisputeByBuyerTxObj.tx).toEqual(
@@ -366,7 +363,7 @@ describe('Contracts', () => {
         const raiseDisputeBySellerTxObj = await ArbitrableTransactionInstance.payArbitrationFeeBySeller(
           arbitrableContractData.partyB,
           0,
-          web3.fromWei(arbitrationCost).toNumber()
+          arbitrationCost
         )
 
         expect(raiseDisputeBySellerTxObj.tx).toEqual(
@@ -423,15 +420,16 @@ describe('Contracts', () => {
         await delaySecond()
         await KlerosPOCInstance.passPeriod(other)
 
-        const currentRuling = await klerosPOCInstance.currentRuling(0)
+        const currentRuling = await KlerosPOCInstance.currentRulingForDispute(0, 0)
         expect(currentRuling.toString()).toBeTruthy() // make sure the ruling exists
 
         const appealCost = await KlerosPOCInstance.getAppealCost(
           0,
           arbitrableContractData.extraData
         )
+
         // raise appeal party A
-        const raiseAppealByPartyATxObj = await ArbitrableTransactionInstanceInstance.appeal(
+        const raiseAppealByPartyATxObj = await ArbitrableTransactionInstance.appeal(
           partyA,
           0,
           arbitrableContractData.extraData,

diff --git a/yarn.lock b/yarn.lock
@@ -5745,9 +5745,9 @@ kleros-interaction@^0.0.15:
     minimetoken "^0.2.0"
     zeppelin-solidity "^1.7.0"
 
-kleros-interaction@^0.0.22:
-  version "0.0.22"
-  resolved "https://registry.yarnpkg.com/kleros-interaction/-/kleros-interaction-0.0.22.tgz#abf006cc3c8d07e35246779e18ea3fabb47bf6a8"
+kleros-interaction@^0.0.24:
+  version "0.0.24"
+  resolved "https://registry.yarnpkg.com/kleros-interaction/-/kleros-interaction-0.0.24.tgz#4bfd836b910ffee6634fffea0b6d85b44dbd3d92"
   dependencies:
     minimetoken "^0.2.0"
     zeppelin-solidity "^1.7.0"