diff options
| author | Bryan Stitt <bryan@stitthappens.com> | 2018-11-13 01:10:40 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-13 01:10:40 +0800 |
| commit | 789f57345298f2700a56f329ba0873c1f623ce8b (patch) | |
| tree | 51b04785b13a9945ffdd15d0b67f564163a146d0 /packages/order-utils/src/order_state_utils.ts | |
| parent | 22f217807d44e364cad6ebe90560326a755cdd11 (diff) | |
| parent | 0ebbbdfca49028f196853bbfb082a1378c09f441 (diff) | |
| download | dexon-sol-tools-789f57345298f2700a56f329ba0873c1f623ce8b.tar dexon-sol-tools-789f57345298f2700a56f329ba0873c1f623ce8b.tar.gz dexon-sol-tools-789f57345298f2700a56f329ba0873c1f623ce8b.tar.bz2 dexon-sol-tools-789f57345298f2700a56f329ba0873c1f623ce8b.tar.lz dexon-sol-tools-789f57345298f2700a56f329ba0873c1f623ce8b.tar.xz dexon-sol-tools-789f57345298f2700a56f329ba0873c1f623ce8b.tar.zst dexon-sol-tools-789f57345298f2700a56f329ba0873c1f623ce8b.zip | |
Merge branch 'development' into patch-1
Diffstat (limited to 'packages/order-utils/src/order_state_utils.ts')
| -rw-r--r-- | packages/order-utils/src/order_state_utils.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/packages/order-utils/src/order_state_utils.ts b/packages/order-utils/src/order_state_utils.ts index 159aeeb09..fe0d6c773 100644 --- a/packages/order-utils/src/order_state_utils.ts +++ b/packages/order-utils/src/order_state_utils.ts @@ -117,7 +117,7 @@ export class OrderStateUtils { public async getOpenOrderStateAsync(signedOrder: SignedOrder, transactionHash?: string): Promise<OrderState> { const orderRelevantState = await this.getOpenOrderRelevantStateAsync(signedOrder); const orderHash = orderHashUtils.getOrderHashHex(signedOrder); - const isOrderCancelled = await this._orderFilledCancelledFetcher.isOrderCancelledAsync(orderHash); + const isOrderCancelled = await this._orderFilledCancelledFetcher.isOrderCancelledAsync(signedOrder); const sidedOrderRelevantState = { isMakerSide: true, traderBalance: orderRelevantState.makerBalance, @@ -256,7 +256,7 @@ export class OrderStateUtils { const filledTakerAssetAmount = await this._orderFilledCancelledFetcher.getFilledTakerAmountAsync(orderHash); const totalMakerAssetAmount = signedOrder.makerAssetAmount; const totalTakerAssetAmount = signedOrder.takerAssetAmount; - const isOrderCancelled = await this._orderFilledCancelledFetcher.isOrderCancelledAsync(orderHash); + const isOrderCancelled = await this._orderFilledCancelledFetcher.isOrderCancelledAsync(signedOrder); const remainingTakerAssetAmount = isOrderCancelled ? new BigNumber(0) : totalTakerAssetAmount.minus(filledTakerAssetAmount); |