diff options
| author | Fabio Berger <me@fabioberger.com> | 2017-06-01 20:59:26 +0800 |
|---|---|---|
| committer | Fabio Berger <me@fabioberger.com> | 2017-06-01 20:59:26 +0800 |
| commit | 085e4fb8962d2d79d60270967aef0f55acb788bf (patch) | |
| tree | eb244736bebb520316eb0a63cf48a5c92b98bb61 /test/utils | |
| parent | 1668a085049d3b065c47709ef0018a66f637b992 (diff) | |
| parent | 75d0b69db294a58b8fdca330d4724ecf758d65f2 (diff) | |
| download | dexon-sol-tools-085e4fb8962d2d79d60270967aef0f55acb788bf.tar dexon-sol-tools-085e4fb8962d2d79d60270967aef0f55acb788bf.tar.gz dexon-sol-tools-085e4fb8962d2d79d60270967aef0f55acb788bf.tar.bz2 dexon-sol-tools-085e4fb8962d2d79d60270967aef0f55acb788bf.tar.lz dexon-sol-tools-085e4fb8962d2d79d60270967aef0f55acb788bf.tar.xz dexon-sol-tools-085e4fb8962d2d79d60270967aef0f55acb788bf.tar.zst dexon-sol-tools-085e4fb8962d2d79d60270967aef0f55acb788bf.zip | |
Merge branch 'fillOrderAsync' of github.com:0xProject/0x.js into fillOrderAsync
Diffstat (limited to 'test/utils')
| -rw-r--r-- | test/utils/order_factory.ts (renamed from test/utils/order.ts) | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/utils/order.ts b/test/utils/order_factory.ts index 8a7d8430e..e41e973ee 100644 --- a/test/utils/order.ts +++ b/test/utils/order_factory.ts @@ -10,6 +10,7 @@ export const orderFactory = { zeroEx: ZeroEx, networkId: number, maker: string, + taker: string, makerTokenAmount: BigNumber.BigNumber|number, makerTokenAddress: string, takerTokenAmount: BigNumber.BigNumber|number, @@ -19,7 +20,7 @@ export const orderFactory = { const INF_TIMESTAMP = 2524604400; const order = { maker, - taker: undefined, + taker, makerFee: new BigNumber(0), takerFee: new BigNumber(0), makerTokenAmount: _.isNumber(makerTokenAmount) ? new BigNumber(makerTokenAmount) : makerTokenAmount, |