diff options
author | Alex Browne <stephenalexbrowne@gmail.com> | 2018-07-18 01:57:39 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-18 01:57:39 +0800 |
commit | b18d2b02745176400aa8cb5e97eb5f2685ca7be2 (patch) | |
tree | 3729bbcd47422bd3354bb58fdc027ee388185130 /packages/contracts/test/exchange/transactions.ts | |
parent | 15e92958d6e908fde7dabb92aa596adfaeb0eece (diff) | |
parent | 9828fa335ea0e52da96c7339854970df33027d65 (diff) | |
download | dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.gz dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.bz2 dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.lz dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.xz dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.tar.zst dexon-sol-tools-b18d2b02745176400aa8cb5e97eb5f2685ca7be2.zip |
Merge pull request #881 from 0xProject/fix/timestamp-conversions
Fix bugs having to do with block timestamps and order expirationTimes
Diffstat (limited to 'packages/contracts/test/exchange/transactions.ts')
-rw-r--r-- | packages/contracts/test/exchange/transactions.ts | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts index 0d66b11b8..831576cd2 100644 --- a/packages/contracts/test/exchange/transactions.ts +++ b/packages/contracts/test/exchange/transactions.ts @@ -121,7 +121,7 @@ describe('Exchange transactions', () => { let takerAssetFillAmount: BigNumber; beforeEach(async () => { erc20Balances = await erc20Wrapper.getBalancesAsync(); - signedOrder = orderFactory.newSignedOrder(); + signedOrder = await orderFactory.newSignedOrderAsync(); orderWithoutExchangeAddress = orderUtils.getOrderWithoutExchangeAddress(signedOrder); takerAssetFillAmount = signedOrder.takerAssetAmount.div(2); @@ -226,7 +226,7 @@ describe('Exchange transactions', () => { it("should cancel an order if called from the order's sender", async () => { const orderSalt = new BigNumber(0); - signedOrder = orderFactory.newSignedOrder({ + signedOrder = await orderFactory.newSignedOrderAsync({ senderAddress: exchangeWrapperContract.address, salt: orderSalt, }); @@ -265,7 +265,7 @@ describe('Exchange transactions', () => { it("should not cancel an order if not called from the order's sender", async () => { const orderSalt = new BigNumber(0); - signedOrder = orderFactory.newSignedOrder({ + signedOrder = await orderFactory.newSignedOrderAsync({ senderAddress: exchangeWrapperContract.address, salt: orderSalt, }); @@ -356,7 +356,7 @@ describe('Exchange transactions', () => { }); beforeEach(async () => { - signedOrder = whitelistOrderFactory.newSignedOrder(); + signedOrder = await whitelistOrderFactory.newSignedOrderAsync(); erc20Balances = await erc20Wrapper.getBalancesAsync(); }); |