From 636dae6a797ecdbdea186c1590ee35eec4521f41 Mon Sep 17 00:00:00 2001 From: Greg Hysen Date: Wed, 16 May 2018 16:57:02 -0700 Subject: The OrderInfo struct is now returned by the getOrderInfo function --- packages/contracts/src/utils/exchange_wrapper.ts | 8 +++----- packages/contracts/src/utils/types.ts | 6 ++++++ 2 files changed, 9 insertions(+), 5 deletions(-) (limited to 'packages/contracts/src/utils') diff --git a/packages/contracts/src/utils/exchange_wrapper.ts b/packages/contracts/src/utils/exchange_wrapper.ts index 5b026fce0..7032db386 100644 --- a/packages/contracts/src/utils/exchange_wrapper.ts +++ b/packages/contracts/src/utils/exchange_wrapper.ts @@ -9,7 +9,7 @@ import { constants } from './constants'; import { formatters } from './formatters'; import { LogDecoder } from './log_decoder'; import { orderUtils } from './order_utils'; -import { AssetProxyId, SignedOrder, SignedTransaction } from './types'; +import { AssetProxyId, OrderInfo, SignedOrder, SignedTransaction } from './types'; export class ExchangeWrapper { private _exchange: ExchangeContract; @@ -225,10 +225,8 @@ export class ExchangeWrapper { const filledAmount = new BigNumber(await this._exchange.filled.callAsync(orderHashHex)); return filledAmount; } - public async getOrderInfoAsync( - signedOrder: SignedOrder, - ): Promise<[number /* orderStatus */, string /* orderHash */, BigNumber /* orderTakerAssetAmountFilled */]> { - const orderInfo: [number, string, BigNumber] = await this._exchange.getOrderInfo.callAsync(signedOrder); + public async getOrderInfoAsync(signedOrder: SignedOrder): Promise { + const orderInfo = (await this._exchange.getOrderInfo.callAsync(signedOrder)) as OrderInfo; return orderInfo; } public async matchOrdersAsync( diff --git a/packages/contracts/src/utils/types.ts b/packages/contracts/src/utils/types.ts index 0e3b2c9a8..518776214 100644 --- a/packages/contracts/src/utils/types.ts +++ b/packages/contracts/src/utils/types.ts @@ -174,3 +174,9 @@ export interface TransferAmountsByMatchOrders { feeReceivedLeft: BigNumber; feeReceivedRight: BigNumber; } + +export interface OrderInfo { + orderStatus: number; + orderHash: string; + orderFilledAmount: BigNumber; +} -- cgit v1.2.3