diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-05 21:23:35 +0800 |
---|---|---|
committer | Fred Carlsen <fred@sjelfull.no> | 2018-12-13 01:19:06 +0800 |
commit | ea8f35b74315fb81246082f56ca5f5fd79077d05 (patch) | |
tree | 8b11a3134c14e14dacab113c0a0a4f3ae6482da9 /contracts/core/test/extensions/dutch_auction.ts | |
parent | 9365a3bc753a4351ead3159cdecc431096529a2b (diff) | |
download | dexon-sol-tools-ea8f35b74315fb81246082f56ca5f5fd79077d05.tar dexon-sol-tools-ea8f35b74315fb81246082f56ca5f5fd79077d05.tar.gz dexon-sol-tools-ea8f35b74315fb81246082f56ca5f5fd79077d05.tar.bz2 dexon-sol-tools-ea8f35b74315fb81246082f56ca5f5fd79077d05.tar.lz dexon-sol-tools-ea8f35b74315fb81246082f56ca5f5fd79077d05.tar.xz dexon-sol-tools-ea8f35b74315fb81246082f56ca5f5fd79077d05.tar.zst dexon-sol-tools-ea8f35b74315fb81246082f56ca5f5fd79077d05.zip |
Refactor out tokens from core contracts package
Diffstat (limited to 'contracts/core/test/extensions/dutch_auction.ts')
-rw-r--r-- | contracts/core/test/extensions/dutch_auction.ts | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/contracts/core/test/extensions/dutch_auction.ts b/contracts/core/test/extensions/dutch_auction.ts index 54e6092d7..b396d4206 100644 --- a/contracts/core/test/extensions/dutch_auction.ts +++ b/contracts/core/test/extensions/dutch_auction.ts @@ -10,6 +10,12 @@ import { txDefaults, web3Wrapper, } from '@0x/contracts-test-utils'; +import { + artifacts as tokensArtifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + WETH9Contract, +} from '@0x/contracts-tokens'; import { BlockchainLifecycle } from '@0x/dev-utils'; import { assetDataUtils, generatePseudoRandomSalt } from '@0x/order-utils'; import { RevertReason, SignedOrder } from '@0x/types'; @@ -20,11 +26,8 @@ import ethAbi = require('ethereumjs-abi'); import * as ethUtil from 'ethereumjs-util'; import * as _ from 'lodash'; -import { DummyERC20TokenContract } from '../../generated-wrappers/dummy_erc20_token'; -import { DummyERC721TokenContract } from '../../generated-wrappers/dummy_erc721_token'; import { DutchAuctionContract } from '../../generated-wrappers/dutch_auction'; import { ExchangeContract } from '../../generated-wrappers/exchange'; -import { WETH9Contract } from '../../generated-wrappers/weth9'; import { artifacts } from '../../src/artifacts'; import { ERC20Wrapper } from '../utils/erc20_wrapper'; import { ERC721Wrapper } from '../utils/erc721_wrapper'; @@ -98,7 +101,7 @@ describe(ContractName.DutchAuction, () => { const erc721Balances = await erc721Wrapper.getBalancesAsync(); erc721MakerAssetIds = erc721Balances[makerAddress][erc721Token.address]; - wethContract = await WETH9Contract.deployFrom0xArtifactAsync(artifacts.WETH9, provider, txDefaults); + wethContract = await WETH9Contract.deployFrom0xArtifactAsync(tokensArtifacts.WETH9, provider, txDefaults); erc20Wrapper.addDummyTokenContract(wethContract as any); const zrxAssetData = assetDataUtils.encodeERC20AssetData(zrxToken.address); |