aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/core/test/exchange/match_orders.ts
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2018-12-05 21:23:35 +0800
committerLeonid Logvinov <logvinov.leon@gmail.com>2018-12-05 22:21:03 +0800
commita365ab11d24ff8365b7d69a948b1b5211b772f5e (patch)
treea5b6f7f83957ee578323d66a00f0b5f233518192 /contracts/core/test/exchange/match_orders.ts
parent48021a227f7034c2238c64146b2eb05eb8bfb687 (diff)
downloaddexon-0x-contracts-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar
dexon-0x-contracts-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.gz
dexon-0x-contracts-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.bz2
dexon-0x-contracts-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.lz
dexon-0x-contracts-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.xz
dexon-0x-contracts-a365ab11d24ff8365b7d69a948b1b5211b772f5e.tar.zst
dexon-0x-contracts-a365ab11d24ff8365b7d69a948b1b5211b772f5e.zip
Refactor out tokens from core contracts package
Diffstat (limited to 'contracts/core/test/exchange/match_orders.ts')
-rw-r--r--contracts/core/test/exchange/match_orders.ts11
1 files changed, 7 insertions, 4 deletions
diff --git a/contracts/core/test/exchange/match_orders.ts b/contracts/core/test/exchange/match_orders.ts
index 0e841b359..8e943c237 100644
--- a/contracts/core/test/exchange/match_orders.ts
+++ b/contracts/core/test/exchange/match_orders.ts
@@ -9,6 +9,12 @@ import {
txDefaults,
web3Wrapper,
} from '@0x/contracts-test-utils';
+import {
+ artifacts as tokensArtifacts,
+ DummyERC20TokenContract,
+ DummyERC721TokenContract,
+ ReentrantERC20TokenContract,
+} from '@0x/contracts-tokens';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { assetDataUtils } from '@0x/order-utils';
import { RevertReason } from '@0x/types';
@@ -17,12 +23,9 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import * as chai from 'chai';
import * as _ from 'lodash';
-import { DummyERC20TokenContract } from '../../generated-wrappers/dummy_erc20_token';
-import { DummyERC721TokenContract } from '../../generated-wrappers/dummy_erc721_token';
import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy';
import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy';
import { ExchangeContract } from '../../generated-wrappers/exchange';
-import { ReentrantERC20TokenContract } from '../../generated-wrappers/reentrant_erc20_token';
import { TestExchangeInternalsContract } from '../../generated-wrappers/test_exchange_internals';
import { artifacts } from '../../src/artifacts';
import { ERC20Wrapper } from '../utils/erc20_wrapper';
@@ -139,7 +142,7 @@ describe('matchOrders', () => {
);
reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync(
- artifacts.ReentrantERC20Token,
+ tokensArtifacts.ReentrantERC20Token,
provider,
txDefaults,
exchange.address,