diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-05-03 00:42:59 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-03 00:42:59 +0800 |
| commit | a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0 (patch) | |
| tree | 7f7e45f54cdd8fc2830621cbb4f89093bef8cbf4 /packages/0x.js/src/utils/order_validation_utils.ts | |
| parent | f08738e13379ea86a33ad9be9f7579e637e69acb (diff) | |
| parent | 3585326d7eb82ae730752d1956876b22f7638fa6 (diff) | |
| download | dexon-sol-tools-a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0.tar dexon-sol-tools-a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0.tar.gz dexon-sol-tools-a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0.tar.bz2 dexon-sol-tools-a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0.tar.lz dexon-sol-tools-a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0.tar.xz dexon-sol-tools-a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0.tar.zst dexon-sol-tools-a054b485d01d5003d47e7959a4fe1e1c0a6dc6a0.zip | |
Merge pull request #559 from 0xProject/feature/order-utils
Move order utils to @0xproject/order-utils
Diffstat (limited to 'packages/0x.js/src/utils/order_validation_utils.ts')
| -rw-r--r-- | packages/0x.js/src/utils/order_validation_utils.ts | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/packages/0x.js/src/utils/order_validation_utils.ts b/packages/0x.js/src/utils/order_validation_utils.ts index b320a3e92..a13c3dc04 100644 --- a/packages/0x.js/src/utils/order_validation_utils.ts +++ b/packages/0x.js/src/utils/order_validation_utils.ts @@ -1,3 +1,4 @@ +import { getOrderHashHex, OrderError } from '@0xproject/order-utils'; import { Order, SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as _ from 'lodash'; @@ -113,7 +114,7 @@ export class OrderValidationUtils { zrxTokenAddress: string, expectedFillTakerTokenAmount?: BigNumber, ): Promise<void> { - const orderHash = utils.getOrderHashHex(signedOrder); + const orderHash = getOrderHashHex(signedOrder); const unavailableTakerTokenAmount = await this._exchangeWrapper.getUnavailableTakerAmountAsync(orderHash); OrderValidationUtils._validateRemainingFillAmountNotZeroOrThrow( signedOrder.takerTokenAmount, @@ -142,9 +143,9 @@ export class OrderValidationUtils { if (fillTakerTokenAmount.eq(0)) { throw new Error(ExchangeContractErrs.OrderFillAmountZero); } - const orderHash = utils.getOrderHashHex(signedOrder); + const orderHash = getOrderHashHex(signedOrder); if (!ZeroEx.isValidSignature(orderHash, signedOrder.ecSignature, signedOrder.maker)) { - throw new Error(ZeroExError.InvalidSignature); + throw new Error(OrderError.InvalidSignature); } const unavailableTakerTokenAmount = await this._exchangeWrapper.getUnavailableTakerAmountAsync(orderHash); OrderValidationUtils._validateRemainingFillAmountNotZeroOrThrow( |