diff options
| author | Amir Bandeali <abandeali1@gmail.com> | 2018-05-25 01:24:32 +0800 |
|---|---|---|
| committer | Amir Bandeali <abandeali1@gmail.com> | 2018-05-31 08:11:31 +0800 |
| commit | 9f93d8f53380bf650702c653fea13b3e7ed5f8f7 (patch) | |
| tree | 5562e78903d0d6cb41ad33afa63f154566f639f5 /packages/contracts/test/exchange/transactions.ts | |
| parent | 6050a59e4a190cf8f8d42e390b435a7184b8f718 (diff) | |
| download | dexon-sol-tools-9f93d8f53380bf650702c653fea13b3e7ed5f8f7.tar dexon-sol-tools-9f93d8f53380bf650702c653fea13b3e7ed5f8f7.tar.gz dexon-sol-tools-9f93d8f53380bf650702c653fea13b3e7ed5f8f7.tar.bz2 dexon-sol-tools-9f93d8f53380bf650702c653fea13b3e7ed5f8f7.tar.lz dexon-sol-tools-9f93d8f53380bf650702c653fea13b3e7ed5f8f7.tar.xz dexon-sol-tools-9f93d8f53380bf650702c653fea13b3e7ed5f8f7.tar.zst dexon-sol-tools-9f93d8f53380bf650702c653fea13b3e7ed5f8f7.zip | |
Fix formatting and tests
Diffstat (limited to 'packages/contracts/test/exchange/transactions.ts')
| -rw-r--r-- | packages/contracts/test/exchange/transactions.ts | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/packages/contracts/test/exchange/transactions.ts b/packages/contracts/test/exchange/transactions.ts index 294e3aae9..0d10f6723 100644 --- a/packages/contracts/test/exchange/transactions.ts +++ b/packages/contracts/test/exchange/transactions.ts @@ -1,4 +1,5 @@ import { BlockchainLifecycle } from '@0xproject/dev-utils'; +import { generatePseudoRandomSalt } from '@0xproject/order-utils'; import { Order, SignedOrder } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; @@ -60,12 +61,6 @@ describe('Exchange transactions', () => { let takerPrivateKey: Buffer; before(async () => { - await blockchainLifecycle.startAsync(); - }); - after(async () => { - await blockchainLifecycle.revertAsync(); - }); - before(async () => { const accounts = await web3Wrapper.getAvailableAddressesAsync(); const usedAddresses = ([owner, senderAddress, makerAddress, takerAddress, feeRecipientAddress] = accounts); @@ -245,7 +240,7 @@ describe('Exchange transactions', () => { const orderStruct = orderUtils.getOrderStruct(signedOrder); const takerAssetFillAmount = signedOrder.takerAssetAmount; - const salt = ZeroEx.generatePseudoRandomSalt(); + const salt = generatePseudoRandomSalt(); return expect( whitelist.fillOrderIfWhitelisted.sendTransactionAsync( orderStruct, @@ -263,7 +258,7 @@ describe('Exchange transactions', () => { const orderStruct = orderUtils.getOrderStruct(signedOrder); const takerAssetFillAmount = signedOrder.takerAssetAmount; - const salt = ZeroEx.generatePseudoRandomSalt(); + const salt = generatePseudoRandomSalt(); return expect( whitelist.fillOrderIfWhitelisted.sendTransactionAsync( orderStruct, @@ -282,7 +277,7 @@ describe('Exchange transactions', () => { const orderStruct = orderUtils.getOrderStruct(signedOrder); const takerAssetFillAmount = signedOrder.takerAssetAmount; - const salt = ZeroEx.generatePseudoRandomSalt(); + const salt = generatePseudoRandomSalt(); await whitelist.fillOrderIfWhitelisted.sendTransactionAsync( orderStruct, takerAssetFillAmount, |