diff options
author | Fabio Berger <me@fabioberger.com> | 2019-02-07 20:33:44 +0800 |
---|---|---|
committer | Fabio Berger <me@fabioberger.com> | 2019-02-07 20:33:44 +0800 |
commit | 7a9ff3846ecbfbdbe5ace374563deea50c15bc45 (patch) | |
tree | a44c30848e06af96b5e1ba1fea395d636e6693ae /contracts/exchange/test/wrapper.ts | |
parent | f118e86cfe478f95eb0450df351871e8278862c3 (diff) | |
parent | 2ef3af000378f66daa0212daaf23c807d018711e (diff) | |
download | dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar.gz dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar.zst dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.zip |
Merge development
Diffstat (limited to 'contracts/exchange/test/wrapper.ts')
-rw-r--r-- | contracts/exchange/test/wrapper.ts | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/contracts/exchange/test/wrapper.ts b/contracts/exchange/test/wrapper.ts index 62a0d426f..5476ac99d 100644 --- a/contracts/exchange/test/wrapper.ts +++ b/contracts/exchange/test/wrapper.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, @@ -22,7 +20,16 @@ import { Web3Wrapper } from '@0x/web3-wrapper'; import * as chai from 'chai'; import * as _ from 'lodash'; -import { artifacts, ExchangeContract, ExchangeWrapper } from '../src'; +import { + artifacts, + DummyERC20TokenContract, + DummyERC721TokenContract, + ERC20ProxyContract, + ERC721ProxyContract, + ExchangeContract, + ExchangeWrapper, + ReentrantERC20TokenContract, +} from '../src'; chaiSetup.configure(); const expect = chai.expect; @@ -107,7 +114,7 @@ describe('Exchange wrappers', () => { ); reentrantErc20Token = await ReentrantERC20TokenContract.deployFrom0xArtifactAsync( - erc20Artifacts.ReentrantERC20Token, + artifacts.ReentrantERC20Token, provider, txDefaults, exchange.address, |