From 197e38adaeb2c6d6258d328ad6c9305709279c93 Mon Sep 17 00:00:00 2001 From: Leonid Logvinov Date: Fri, 7 Jul 2017 14:39:04 -0700 Subject: Migrate isRoundingError parameter changes --- src/artifacts/exchange/Exchange_v1.json | 4 ++-- src/contract_wrappers/exchange_wrapper.ts | 10 +++++----- src/types.ts | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/artifacts/exchange/Exchange_v1.json b/src/artifacts/exchange/Exchange_v1.json index ed5f08b72..e6ed335ca 100644 --- a/src/artifacts/exchange/Exchange_v1.json +++ b/src/artifacts/exchange/Exchange_v1.json @@ -31,11 +31,11 @@ "constant": true, "inputs": [ { - "name": "denominator", + "name": "numerator", "type": "uint256" }, { - "name": "numerator", + "name": "denominator", "type": "uint256" }, { diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts index a06471bba..9bedb1b3c 100644 --- a/src/contract_wrappers/exchange_wrapper.ts +++ b/src/contract_wrappers/exchange_wrapper.ts @@ -662,7 +662,7 @@ export class ExchangeWrapper extends ContractWrapper { senderAddress, zrxTokenAddress); const wouldRoundingErrorOccur = await this._isRoundingErrorAsync( - signedOrder.takerTokenAmount, fillTakerAmount, signedOrder.makerTokenAmount, + fillTakerAmount, signedOrder.takerTokenAmount, signedOrder.makerTokenAmount, signedOrder.exchangeContractAddress, ); if (wouldRoundingErrorOccur) { @@ -764,14 +764,14 @@ export class ExchangeWrapper extends ContractWrapper { throw new Error(errMessage); } } - private async _isRoundingErrorAsync(takerTokenAmount: BigNumber.BigNumber, - fillTakerAmount: BigNumber.BigNumber, - makerTokenAmount: BigNumber.BigNumber, + private async _isRoundingErrorAsync(numerator: BigNumber.BigNumber, + denominator: BigNumber.BigNumber, + target: BigNumber.BigNumber, exchangeContractAddress: string): Promise { await assert.isUserAddressAvailableAsync(this._web3Wrapper); const exchangeInstance = await this._getExchangeContractAsync(exchangeContractAddress); const isRoundingError = await exchangeInstance.isRoundingError.call( - takerTokenAmount, fillTakerAmount, makerTokenAmount, + numerator, denominator, target, ); return isRoundingError; } diff --git a/src/types.ts b/src/types.ts index dfb4d12c5..2887e83ff 100644 --- a/src/types.ts +++ b/src/types.ts @@ -68,8 +68,8 @@ export interface ExchangeContract extends ContractInstance { call: (orderHash: string) => BigNumber.BigNumber; }; isRoundingError: { - call: (takerTokenAmount: BigNumber.BigNumber, fillTakerAmount: BigNumber.BigNumber, - makerTokenAmount: BigNumber.BigNumber, txOpts?: TxOpts) => Promise; + call: (numerator: BigNumber.BigNumber, denominator: BigNumber.BigNumber, + target: BigNumber.BigNumber, txOpts?: TxOpts) => Promise; }; fill: { (orderAddresses: OrderAddresses, orderValues: OrderValues, fillAmount: BigNumber.BigNumber, -- cgit v1.2.3