diff options
author | Fabio Berger <me@fabioberger.com> | 2017-11-14 10:12:31 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-14 10:12:31 +0800 |
commit | 682fbd3b76faf8a5a84490fe53af7e0744c578c6 (patch) | |
tree | f76ab86ece2c182eee20cfff43d27ceb0909c1e2 /packages/0x.js/src/utils | |
parent | 08963f269b543d0f6f125ff77efdda23339865ed (diff) | |
parent | 8de64c94950584b2b764394a749f63bcabe9219b (diff) | |
download | dexon-sol-tools-682fbd3b76faf8a5a84490fe53af7e0744c578c6.tar dexon-sol-tools-682fbd3b76faf8a5a84490fe53af7e0744c578c6.tar.gz dexon-sol-tools-682fbd3b76faf8a5a84490fe53af7e0744c578c6.tar.bz2 dexon-sol-tools-682fbd3b76faf8a5a84490fe53af7e0744c578c6.tar.lz dexon-sol-tools-682fbd3b76faf8a5a84490fe53af7e0744c578c6.tar.xz dexon-sol-tools-682fbd3b76faf8a5a84490fe53af7e0744c578c6.tar.zst dexon-sol-tools-682fbd3b76faf8a5a84490fe53af7e0744c578c6.zip |
Merge pull request #217 from dekz/fixCancelledNaming2
Standardise on Cancelled over canceled
Diffstat (limited to 'packages/0x.js/src/utils')
-rw-r--r-- | packages/0x.js/src/utils/order_state_utils.ts | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/packages/0x.js/src/utils/order_state_utils.ts b/packages/0x.js/src/utils/order_state_utils.ts index f82601cae..a1ee7577d 100644 --- a/packages/0x.js/src/utils/order_state_utils.ts +++ b/packages/0x.js/src/utils/order_state_utils.ts @@ -67,7 +67,7 @@ export class OrderStateUtils { zrxTokenAddress, signedOrder.maker, ); const filledTakerTokenAmount = await this.orderFilledCancelledLazyStore.getFilledTakerAmountAsync(orderHash); - const canceledTakerTokenAmount = await this.orderFilledCancelledLazyStore.getCancelledTakerAmountAsync( + const cancelledTakerTokenAmount = await this.orderFilledCancelledLazyStore.getCancelledTakerAmountAsync( orderHash, ); const unavailableTakerTokenAmount = await exchange.getUnavailableTakerAmountAsync(orderHash); @@ -85,13 +85,13 @@ export class OrderStateUtils { makerFeeBalance, makerFeeProxyAllowance, filledTakerTokenAmount, - canceledTakerTokenAmount, + cancelledTakerTokenAmount, remainingFillableMakerTokenAmount, }; return orderRelevantState; } private validateIfOrderIsValid(signedOrder: SignedOrder, orderRelevantState: OrderRelevantState): void { - const unavailableTakerTokenAmount = orderRelevantState.canceledTakerTokenAmount.add( + const unavailableTakerTokenAmount = orderRelevantState.cancelledTakerTokenAmount.add( orderRelevantState.filledTakerTokenAmount, ); const availableTakerTokenAmount = signedOrder.takerTokenAmount.minus(unavailableTakerTokenAmount); |