aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/exchange/test/transactions.ts
diff options
context:
space:
mode:
authorAmir Bandeali <abandeali1@gmail.com>2019-01-22 06:20:33 +0800
committerAmir Bandeali <abandeali1@gmail.com>2019-01-22 13:41:21 +0800
commit0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1 (patch)
treed5afc5124cd49a361bf282df0255e8b122459373 /contracts/exchange/test/transactions.ts
parent9fa86195900383640f382850f6fe0d827d48bb9b (diff)
downloaddexon-0x-contracts-0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1.tar
dexon-0x-contracts-0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1.tar.gz
dexon-0x-contracts-0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1.tar.bz2
dexon-0x-contracts-0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1.tar.lz
dexon-0x-contracts-0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1.tar.xz
dexon-0x-contracts-0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1.tar.zst
dexon-0x-contracts-0758f231e21e9b9d3c3ca21ea639b0d8d9acf2f1.zip
Split tokens package into erc20 and erc721
Diffstat (limited to 'contracts/exchange/test/transactions.ts')
-rw-r--r--contracts/exchange/test/transactions.ts10
1 files changed, 3 insertions, 7 deletions
diff --git a/contracts/exchange/test/transactions.ts b/contracts/exchange/test/transactions.ts
index a1d855631..613953493 100644
--- a/contracts/exchange/test/transactions.ts
+++ b/contracts/exchange/test/transactions.ts
@@ -1,4 +1,5 @@
-import { ERC20ProxyContract } from '@0x/contracts-asset-proxy';
+import { ERC20ProxyContract, ERC20Wrapper } from '@0x/contracts-asset-proxy';
+import { DummyERC20TokenContract } from '@0x/contracts-erc20';
import {
chaiSetup,
constants,
@@ -12,7 +13,6 @@ import {
txDefaults,
web3Wrapper,
} from '@0x/contracts-test-utils';
-import { DummyERC20TokenContract } from '@0x/contracts-tokens';
import { BlockchainLifecycle } from '@0x/dev-utils';
import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils';
import { OrderWithoutExchangeAddress, RevertReason, SignedOrder } from '@0x/types';
@@ -20,11 +20,7 @@ import { BigNumber } from '@0x/utils';
import * as chai from 'chai';
import * as _ from 'lodash';
-import { ExchangeContract } from '../generated-wrappers/exchange';
-import { artifacts, ExchangeWrapperContract, WhitelistContract } from '../src/';
-
-import { ERC20Wrapper } from './utils/erc20_wrapper';
-import { ExchangeWrapper } from './utils/exchange_wrapper';
+import { artifacts, ExchangeContract, ExchangeWrapper, ExchangeWrapperContract, WhitelistContract } from '../src/';
chaiSetup.configure();
const expect = chai.expect;