diff options
| author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-16 20:38:27 +0800 |
|---|---|---|
| committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-07-16 20:38:27 +0800 |
| commit | acff177c547dee049b97e4b051fe22e1efaf992c (patch) | |
| tree | 4580187592aac7695c1edae15a6f68eea5b1078c /packages/contract-wrappers/test | |
| parent | ffeb3194a8f5e68c266f0bc6c70c6c9ba0754ec6 (diff) | |
| parent | 6bdee26c3037733ad198d54c1e88f3c7647ad230 (diff) | |
| download | dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar.gz dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar.bz2 dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar.lz dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar.xz dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.tar.zst dexon-0x-contracts-acff177c547dee049b97e4b051fe22e1efaf992c.zip | |
Merge branch 'v2-prototype' into feature/order-watcher-v2
Diffstat (limited to 'packages/contract-wrappers/test')
| -rw-r--r-- | packages/contract-wrappers/test/erc20_wrapper_test.ts | 3 | ||||
| -rw-r--r-- | packages/contract-wrappers/test/erc721_wrapper_test.ts | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/packages/contract-wrappers/test/erc20_wrapper_test.ts b/packages/contract-wrappers/test/erc20_wrapper_test.ts index 0011508e0..cf7ac527e 100644 --- a/packages/contract-wrappers/test/erc20_wrapper_test.ts +++ b/packages/contract-wrappers/test/erc20_wrapper_test.ts @@ -1,11 +1,10 @@ import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { EmptyWalletSubprovider } from '@0xproject/subproviders'; +import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; import { DoneCallback } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import { Provider } from 'ethereum-types'; import 'mocha'; -import Web3ProviderEngine = require('web3-provider-engine'); import { BlockParamLiteral, diff --git a/packages/contract-wrappers/test/erc721_wrapper_test.ts b/packages/contract-wrappers/test/erc721_wrapper_test.ts index 96b8fcf1d..f005ac2e0 100644 --- a/packages/contract-wrappers/test/erc721_wrapper_test.ts +++ b/packages/contract-wrappers/test/erc721_wrapper_test.ts @@ -1,11 +1,10 @@ import { BlockchainLifecycle, callbackErrorReporter } from '@0xproject/dev-utils'; -import { EmptyWalletSubprovider } from '@0xproject/subproviders'; +import { EmptyWalletSubprovider, Web3ProviderEngine } from '@0xproject/subproviders'; import { DoneCallback } from '@0xproject/types'; import { BigNumber } from '@0xproject/utils'; import * as chai from 'chai'; import { Provider } from 'ethereum-types'; import 'mocha'; -import Web3ProviderEngine = require('web3-provider-engine'); import { BlockParamLiteral, |