diff options
author | Fabio Berger <me@fabioberger.com> | 2018-06-11 20:34:00 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2018-06-11 20:34:00 +0800 |
commit | afa27a3c2a394c0d0c2109220994cb9f7536c1f9 (patch) | |
tree | 4c3def2b1b026bade710a44d20d930bb273a67db /packages/contract-wrappers | |
parent | ce6078ed9455aa21f31970f3d3acc4401200cc5d (diff) | |
download | dexon-0x-contracts-afa27a3c2a394c0d0c2109220994cb9f7536c1f9.tar dexon-0x-contracts-afa27a3c2a394c0d0c2109220994cb9f7536c1f9.tar.gz dexon-0x-contracts-afa27a3c2a394c0d0c2109220994cb9f7536c1f9.tar.bz2 dexon-0x-contracts-afa27a3c2a394c0d0c2109220994cb9f7536c1f9.tar.lz dexon-0x-contracts-afa27a3c2a394c0d0c2109220994cb9f7536c1f9.tar.xz dexon-0x-contracts-afa27a3c2a394c0d0c2109220994cb9f7536c1f9.tar.zst dexon-0x-contracts-afa27a3c2a394c0d0c2109220994cb9f7536c1f9.zip |
Refactor orderValidationUtils to use the generated contract wrapper instead of the higher-level one
Diffstat (limited to 'packages/contract-wrappers')
-rw-r--r-- | packages/contract-wrappers/src/utils/order_validation_utils.ts | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/packages/contract-wrappers/src/utils/order_validation_utils.ts b/packages/contract-wrappers/src/utils/order_validation_utils.ts index b6b3334a6..c6ef26275 100644 --- a/packages/contract-wrappers/src/utils/order_validation_utils.ts +++ b/packages/contract-wrappers/src/utils/order_validation_utils.ts @@ -3,7 +3,7 @@ import { ExchangeContractErrs, Order, SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; -import { ExchangeWrapper } from '../contract_wrappers/exchange_wrapper'; +import { ExchangeContract } from '../contract_wrappers/generated/exchange'; import { TradeSide, TransferType } from '../types'; import { constants } from '../utils/constants'; import { utils } from '../utils/utils'; @@ -11,7 +11,7 @@ import { utils } from '../utils/utils'; import { ExchangeTransferSimulator } from './exchange_transfer_simulator'; export class OrderValidationUtils { - private _exchangeWrapper: ExchangeWrapper; + private _exchangeContract: ExchangeContract; public static validateCancelOrderThrowIfInvalid( order: Order, cancelTakerTokenAmount: BigNumber, @@ -104,8 +104,8 @@ export class OrderValidationUtils { .round(0); return fillMakerTokenAmount; } - constructor(exchangeWrapper: ExchangeWrapper) { - this._exchangeWrapper = exchangeWrapper; + constructor(exchangeContract: ExchangeContract) { + this._exchangeContract = exchangeContract; } public async validateOrderFillableOrThrowAsync( exchangeTradeEmulator: ExchangeTransferSimulator, @@ -114,7 +114,9 @@ export class OrderValidationUtils { expectedFillTakerTokenAmount?: BigNumber, ): Promise<void> { const orderHash = getOrderHashHex(signedOrder); - const unavailableTakerTokenAmount = await this._exchangeWrapper.getUnavailableTakerAmountAsync(orderHash); + const unavailableTakerTokenAmount = await this._exchangeContract.getUnavailableTakerTokenAmount.callAsync( + orderHash, + ); OrderValidationUtils._validateRemainingFillAmountNotZeroOrThrow( signedOrder.takerTokenAmount, unavailableTakerTokenAmount, @@ -146,7 +148,9 @@ export class OrderValidationUtils { if (!isValidSignature(orderHash, signedOrder.ecSignature, signedOrder.maker)) { throw new Error(OrderError.InvalidSignature); } - const unavailableTakerTokenAmount = await this._exchangeWrapper.getUnavailableTakerAmountAsync(orderHash); + const unavailableTakerTokenAmount = await this._exchangeContract.getUnavailableTakerTokenAmount.callAsync( + orderHash, + ); OrderValidationUtils._validateRemainingFillAmountNotZeroOrThrow( signedOrder.takerTokenAmount, unavailableTakerTokenAmount, @@ -167,7 +171,7 @@ export class OrderValidationUtils { zrxTokenAddress, ); - const wouldRoundingErrorOccur = await this._exchangeWrapper.isRoundingErrorAsync( + const wouldRoundingErrorOccur = await this._exchangeContract.isRoundingError.callAsync( filledTakerTokenAmount, signedOrder.takerTokenAmount, signedOrder.makerTokenAmount, |