diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-28 06:03:57 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2017-11-28 06:03:57 +0800 |
| commit | 32867c9a07fc7c833ff8491ec4feea8c783e7f4d (patch) | |
| tree | 69be48f0ca710eb70221a542f662d283e9a8215b /packages/0x.js/test | |
| parent | cf0a8b2d0503f9d08ac789024d44b196613ecdc3 (diff) | |
| download | dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.gz dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.bz2 dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.lz dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.xz dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.tar.zst dexon-sol-tools-32867c9a07fc7c833ff8491ec4feea8c783e7f4d.zip | |
Fix merge conflicts
Diffstat (limited to 'packages/0x.js/test')
| -rw-r--r-- | packages/0x.js/test/exchange_transfer_simulator_test.ts | 7 | ||||
| -rw-r--r-- | packages/0x.js/test/order_validation_test.ts | 7 |
2 files changed, 2 insertions, 12 deletions
diff --git a/packages/0x.js/test/exchange_transfer_simulator_test.ts b/packages/0x.js/test/exchange_transfer_simulator_test.ts index 82cd54a34..a1d9bdade 100644 --- a/packages/0x.js/test/exchange_transfer_simulator_test.ts +++ b/packages/0x.js/test/exchange_transfer_simulator_test.ts @@ -2,12 +2,7 @@ import BigNumber from 'bignumber.js'; import * as chai from 'chai'; import {ExchangeContractErrs, Token, ZeroEx} from '../src'; -import {TradeSide, TransferType} from '../src/types'; -import {chaiSetup} from './utils/chai_setup'; -import {web3Factory} from './utils/web3_factory'; -import {ZeroEx, ExchangeContractErrs, Token} from '../src'; -import {TradeSide, TransferType, BlockParamLiteral} from '../src/types'; -import {BlockchainLifecycle} from './utils/blockchain_lifecycle'; +import {BlockParamLiteral, TradeSide, TransferType} from '../src/types'; import {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator'; import {BlockchainLifecycle} from './utils/blockchain_lifecycle'; diff --git a/packages/0x.js/test/order_validation_test.ts b/packages/0x.js/test/order_validation_test.ts index 3725c85da..d585c1f3c 100644 --- a/packages/0x.js/test/order_validation_test.ts +++ b/packages/0x.js/test/order_validation_test.ts @@ -4,15 +4,10 @@ import * as Sinon from 'sinon'; import * as Web3 from 'web3'; import {ExchangeContractErrs, SignedOrder, Token, ZeroEx, ZeroExError} from '../src'; -import {TradeSide, TransferType} from '../src/types'; +import {BlockParamLiteral, TradeSide, TransferType} from '../src/types'; import {ExchangeTransferSimulator} from '../src/utils/exchange_transfer_simulator'; import {OrderValidationUtils} from '../src/utils/order_validation_utils'; -import {chaiSetup} from './utils/chai_setup'; -import {web3Factory} from './utils/web3_factory'; -import {ZeroEx, SignedOrder, Token, ExchangeContractErrs, ZeroExError} from '../src'; -import {TradeSide, TransferType, BlockParamLiteral} from '../src/types'; -import {TokenUtils} from './utils/token_utils'; import {BlockchainLifecycle} from './utils/blockchain_lifecycle'; import {chaiSetup} from './utils/chai_setup'; import {constants} from './utils/constants'; |