From a848a2f4838bed854f397d837b03dc5877ae2220 Mon Sep 17 00:00:00 2001 From: Nicolas Wagner Date: Wed, 12 Sep 2018 15:28:43 +0200 Subject: [PATCH] fix(contract): fix payArbitrationSeller Fee ;skip --- .../arbitrable/MultipleArbitrableTransaction.js | 11 ++++------- tests/integration/contracts.test.js | 5 ++--- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js b/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js index da1578f..ce80abc 100644 --- a/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js +++ b/src/contracts/implementations/arbitrable/MultipleArbitrableTransaction.js @@ -174,25 +174,22 @@ class MultipleArbitrableTransaction extends Arbitrable { * Pay the arbitration fee to raise a dispute. To be called by the seller. * @param {string} account Ethereum account. * @param {number} arbitrableTransactionId - The index of the transaction. + * @param {number} arbitrationCost - Arbitration cost. * @returns {object} - The result transaction object. */ payArbitrationFeeBySeller = async ( account, - arbitrableTransactionId + arbitrableTransactionId, + arbitrationCost ) => { await this.loadContract() - const transactionArbitrableData0 = await this.getData(0) - try { return this.contractInstance.payArbitrationFeeBySeller( arbitrableTransactionId, { from: account, - value: this._Web3Wrapper.toWei( - transactionArbitrableData0.sellerFee, - 'ether' - ) + value: this._Web3Wrapper.toWei(arbitrationCost, 'ether') } ) } catch (err) { diff --git a/tests/integration/contracts.test.js b/tests/integration/contracts.test.js index 1b23c20..5f54510 100644 --- a/tests/integration/contracts.test.js +++ b/tests/integration/contracts.test.js @@ -355,7 +355,7 @@ describe('Contracts', () => { const raiseDisputeByBuyerTxObj = await ArbitrableTransactionInstance.payArbitrationFeeByBuyer( arbitrableContractData.partyA, 0, - web3.fromWei(arbitrationCost) + web3.fromWei(arbitrationCost).toNumber() ) expect(raiseDisputeByBuyerTxObj.tx).toEqual( @@ -366,14 +366,13 @@ describe('Contracts', () => { const raiseDisputeBySellerTxObj = await ArbitrableTransactionInstance.payArbitrationFeeBySeller( arbitrableContractData.partyB, 0, - web3.fromWei(arbitrationCost) + web3.fromWei(arbitrationCost).toNumber() ) expect(raiseDisputeBySellerTxObj.tx).toEqual( expect.stringMatching(/^0x[a-f0-9]{64}$/) ) // tx hash - // ****** Juror side (pass period) ****** // let newPeriod