diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-10-30 22:17:39 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-10-30 22:17:39 +0800 |
| commit | b49d1dae7debbb50c57dc4755447f2cffee35ccd (patch) | |
| tree | 25397180b858b508312cc4a6c721b848cf1cd1d2 /test/utils/order_factory.ts | |
| parent | 9b0496b0491e9fbe353a4c29d8082cf56ede9e38 (diff) | |
| parent | fec8f8a881dde19132dcf0eea727ae9fbb25adb6 (diff) | |
| download | dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.gz dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.bz2 dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.lz dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.xz dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.tar.zst dexon-sol-tools-b49d1dae7debbb50c57dc4755447f2cffee35ccd.zip | |
Merge branch 'development' of github.com:0xProject/0x.js into development
* 'development' of github.com:0xProject/0x.js:
Update CHANGELOG
0.22.4
Add HACK comments
Add a forgotten augmentation file
Upgrade bignumber to the version with native typings and remove typings
Downgrade typedoc
Upgrade bignumber to the version with native typings and remove typings
Diffstat (limited to 'test/utils/order_factory.ts')
| -rw-r--r-- | test/utils/order_factory.ts | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/utils/order_factory.ts b/test/utils/order_factory.ts index fc4adebd9..6086e09f7 100644 --- a/test/utils/order_factory.ts +++ b/test/utils/order_factory.ts @@ -1,5 +1,5 @@ import * as _ from 'lodash'; -import * as BigNumber from 'bignumber.js'; +import BigNumber from 'bignumber.js'; import {ZeroEx, SignedOrder} from '../../src'; export const orderFactory = { @@ -7,15 +7,15 @@ export const orderFactory = { zeroEx: ZeroEx, maker: string, taker: string, - makerFee: BigNumber.BigNumber, - takerFee: BigNumber.BigNumber, - makerTokenAmount: BigNumber.BigNumber, + makerFee: BigNumber, + takerFee: BigNumber, + makerTokenAmount: BigNumber, makerTokenAddress: string, - takerTokenAmount: BigNumber.BigNumber, + takerTokenAmount: BigNumber, takerTokenAddress: string, exchangeContractAddress: string, feeRecipient: string, - expirationUnixTimestampSec?: BigNumber.BigNumber): Promise<SignedOrder> { + expirationUnixTimestampSec?: BigNumber): Promise<SignedOrder> { const defaultExpirationUnixTimestampSec = new BigNumber(2524604400); // Close to infinite expirationUnixTimestampSec = _.isUndefined(expirationUnixTimestampSec) ? defaultExpirationUnixTimestampSec : |