diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2018-12-11 01:09:33 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-12-11 01:09:33 +0800 |
commit | 190d9244cc5544662effae508f94025a6f5de286 (patch) | |
tree | 0cfbf8a284db41ca16cceddc301badf50e9e1ee2 /contracts/core/test | |
parent | a286228b2005c33cc4ca8e17772a9bd259eeb1ce (diff) | |
parent | 51b1de041e3ce2a03ba79614d9a3166fbcab6222 (diff) | |
download | dexon-sol-tools-190d9244cc5544662effae508f94025a6f5de286.tar dexon-sol-tools-190d9244cc5544662effae508f94025a6f5de286.tar.gz dexon-sol-tools-190d9244cc5544662effae508f94025a6f5de286.tar.bz2 dexon-sol-tools-190d9244cc5544662effae508f94025a6f5de286.tar.lz dexon-sol-tools-190d9244cc5544662effae508f94025a6f5de286.tar.xz dexon-sol-tools-190d9244cc5544662effae508f94025a6f5de286.tar.zst dexon-sol-tools-190d9244cc5544662effae508f94025a6f5de286.zip |
Merge pull request #1385 from 0xProject/feature/contracts-monorepo-5
Refactor our protocol interfaces into `@0x/contracts-interfaces`
Diffstat (limited to 'contracts/core/test')
-rw-r--r-- | contracts/core/test/asset_proxy/proxies.ts | 7 | ||||
-rw-r--r-- | contracts/core/test/exchange/core.ts | 4 |
2 files changed, 5 insertions, 6 deletions
diff --git a/contracts/core/test/asset_proxy/proxies.ts b/contracts/core/test/asset_proxy/proxies.ts index 2527b0fbf..faa643924 100644 --- a/contracts/core/test/asset_proxy/proxies.ts +++ b/contracts/core/test/asset_proxy/proxies.ts @@ -1,3 +1,4 @@ +import { artifacts as interfacesArtifacts, IAssetDataContract, IAssetProxyContract } from '@0x/contracts-interfaces'; import { chaiSetup, constants, @@ -22,8 +23,6 @@ import { DummyMultipleReturnERC20TokenContract } from '../../generated-wrappers/ import { DummyNoReturnERC20TokenContract } from '../../generated-wrappers/dummy_no_return_erc20_token'; import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy'; import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy'; -import { IAssetDataContract } from '../../generated-wrappers/i_asset_data'; -import { IAssetProxyContract } from '../../generated-wrappers/i_asset_proxy'; import { MultiAssetProxyContract } from '../../generated-wrappers/multi_asset_proxy'; import { artifacts } from '../../src/artifacts'; import { ERC20Wrapper } from '../utils/erc20_wrapper'; @@ -33,12 +32,12 @@ chaiSetup.configure(); const expect = chai.expect; const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); const assetProxyInterface = new IAssetProxyContract( - artifacts.IAssetProxy.compilerOutput.abi, + interfacesArtifacts.IAssetProxy.compilerOutput.abi, constants.NULL_ADDRESS, provider, ); const assetDataInterface = new IAssetDataContract( - artifacts.IAssetData.compilerOutput.abi, + interfacesArtifacts.IAssetData.compilerOutput.abi, constants.NULL_ADDRESS, provider, ); diff --git a/contracts/core/test/exchange/core.ts b/contracts/core/test/exchange/core.ts index fd6b9ee6b..45eae0f22 100644 --- a/contracts/core/test/exchange/core.ts +++ b/contracts/core/test/exchange/core.ts @@ -1,3 +1,4 @@ +import { artifacts as interfacesArtifacts, IAssetDataContract } from '@0x/contracts-interfaces'; import { chaiSetup, constants, @@ -27,7 +28,6 @@ import { DummyNoReturnERC20TokenContract } from '../../generated-wrappers/dummy_ import { ERC20ProxyContract } from '../../generated-wrappers/erc20_proxy'; import { ERC721ProxyContract } from '../../generated-wrappers/erc721_proxy'; import { ExchangeCancelEventArgs, ExchangeContract } from '../../generated-wrappers/exchange'; -import { IAssetDataContract } from '../../generated-wrappers/i_asset_data'; import { MultiAssetProxyContract } from '../../generated-wrappers/multi_asset_proxy'; import { ReentrantERC20TokenContract } from '../../generated-wrappers/reentrant_erc20_token'; import { TestStaticCallReceiverContract } from '../../generated-wrappers/test_static_call_receiver'; @@ -40,7 +40,7 @@ chaiSetup.configure(); const expect = chai.expect; const blockchainLifecycle = new BlockchainLifecycle(web3Wrapper); const assetDataInterface = new IAssetDataContract( - artifacts.IAssetData.compilerOutput.abi, + interfacesArtifacts.IAssetData.compilerOutput.abi, constants.NULL_ADDRESS, provider, ); |