aboutsummaryrefslogtreecommitdiffstats
path: root/contracts/extensions/test/dutch_auction.ts
diff options
context:
space:
mode:
authorLeonid Logvinov <logvinov.leon@gmail.com>2019-02-07 19:23:00 +0800
committerGitHub <noreply@github.com>2019-02-07 19:23:00 +0800
commit7e19c944b91f573bb026ca3a916cd4e4b9169a9e (patch)
tree252302871a01eee80ae64966ed72dc82b6eda1aa /contracts/extensions/test/dutch_auction.ts
parent2a344e26cc51fa41a9df3535b625b8609dfc167e (diff)
parentfd4d3cff880e9131d55a4e534c17289db5f72b6b (diff)
downloaddexon-0x-contracts-7e19c944b91f573bb026ca3a916cd4e4b9169a9e.tar
dexon-0x-contracts-7e19c944b91f573bb026ca3a916cd4e4b9169a9e.tar.gz
dexon-0x-contracts-7e19c944b91f573bb026ca3a916cd4e4b9169a9e.tar.bz2
dexon-0x-contracts-7e19c944b91f573bb026ca3a916cd4e4b9169a9e.tar.lz
dexon-0x-contracts-7e19c944b91f573bb026ca3a916cd4e4b9169a9e.tar.xz
dexon-0x-contracts-7e19c944b91f573bb026ca3a916cd4e4b9169a9e.tar.zst
dexon-0x-contracts-7e19c944b91f573bb026ca3a916cd4e4b9169a9e.zip
Merge pull request #1575 from 0xProject/feature/contracts-gen
Contracts generator
Diffstat (limited to 'contracts/extensions/test/dutch_auction.ts')
-rw-r--r--contracts/extensions/test/dutch_auction.ts18
1 files changed, 12 insertions, 6 deletions
diff --git a/contracts/extensions/test/dutch_auction.ts b/contracts/extensions/test/dutch_auction.ts
index 34ff25c3d..efe813ffc 100644
--- a/contracts/extensions/test/dutch_auction.ts
+++ b/contracts/extensions/test/dutch_auction.ts
@@ -1,8 +1,6 @@
import { DutchAuctionWrapper } from '@0x/contract-wrappers';
import { ERC20Wrapper, ERC721Wrapper } from '@0x/contracts-asset-proxy';
-import { artifacts as erc20Artifacts, DummyERC20TokenContract, WETH9Contract } from '@0x/contracts-erc20';
-import { DummyERC721TokenContract } from '@0x/contracts-erc721';
-import { artifacts as exchangeArtifacts, ExchangeContract, ExchangeWrapper } from '@0x/contracts-exchange';
+import { ExchangeWrapper } from '@0x/contracts-exchange';
import {
chaiSetup,
constants,
@@ -23,7 +21,15 @@ import { Web3Wrapper } from '@0x/web3-wrapper';
import * as chai from 'chai';
import * as _ from 'lodash';
-import { artifacts, DutchAuctionContract, DutchAuctionTestWrapper } from '../src';
+import {
+ artifacts,
+ DummyERC20TokenContract,
+ DummyERC721TokenContract,
+ DutchAuctionContract,
+ DutchAuctionTestWrapper,
+ ExchangeContract,
+ WETH9Contract,
+} from '../src';
chaiSetup.configure();
const expect = chai.expect;
@@ -82,12 +88,12 @@ describe(ContractName.DutchAuction, () => {
const erc721Balances = await erc721Wrapper.getBalancesAsync();
erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address];
- wethContract = await WETH9Contract.deployFrom0xArtifactAsync(erc20Artifacts.WETH9, provider, txDefaults);
+ wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults);
erc20Wrapper.addDummyTokenContract(wethContract as any);
const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address);
const exchangeInstance = await ExchangeContract.deployFrom0xArtifactAsync(
- exchangeArtifacts.Exchange,
+ artifacts.Exchange,
provider,
txDefaults,
zrxAssetData,