diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-02-04 17:12:49 +0800 |
---|---|---|
committer | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-02-04 17:38:02 +0800 |
commit | 6943bbcacbd9a1df0cdddb2696a768aec4b3d2c4 (patch) | |
tree | 768bb7240b510a8e9f0c735ae658497583160627 /contracts/exchange/test/match_orders.ts | |
parent | 1d3fff32a29b4e958cd32acb016577683df95d3d (diff) | |
download | dexon-0x-contracts-6943bbcacbd9a1df0cdddb2696a768aec4b3d2c4.tar.gz dexon-0x-contracts-6943bbcacbd9a1df0cdddb2696a768aec4b3d2c4.tar.zst dexon-0x-contracts-6943bbcacbd9a1df0cdddb2696a768aec4b3d2c4.zip |
Temp
Diffstat (limited to 'contracts/exchange/test/match_orders.ts')
-rw-r--r-- | contracts/exchange/test/match_orders.ts | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/contracts/exchange/test/match_orders.ts b/contracts/exchange/test/match_orders.ts index d17025ddd..98fea67ea 100644 --- a/contracts/exchange/test/match_orders.ts +++ b/contracts/exchange/test/match_orders.ts @@ -1,6 +1,4 @@ -import { ERC20ProxyContract, ERC20Wrapper, ERC721ProxyContract, ERC721Wrapper } from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts, DummyERC20TokenContract, ReentrantERC20TokenContract } from '@0x/contracts-erc20'; -import { DummyERC721TokenContract } from '@0x/contracts-erc721'; +import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy'; import { chaiSetup, constants, @@ -20,7 +18,18 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; -import { artifacts, ExchangeContract, ExchangeWrapper, MatchOrderTester, TestExchangeInternalsContract } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, + ExchangeContract, + ExchangeWrapper, + MatchOrderTester, + ReentrantERC20TokenContract, + TestExchangeInternalsContract, +} from '../src'; const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); chaiSetup.configure(); @@ -131,7 +140,7 @@ describe('matchOrders', () => { ); reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.ReentrantERC20Token, + artifacts.ReentrantERC20Token, provider, txDefaults, exchange.address, |