diff options
author | Leonid Logvinov <logvinov.leon@gmail.com> | 2019-02-07 19:23:00 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-07 19:23:00 +0800 |
commit | 7e19c944b91f573bb026ca3a916cd4e4b9169a9e (patch) | |
tree | 252302871a01eee80ae64966ed72dc82b6eda1aa /contracts/multisig/test | |
parent | 2a344e26cc51fa41a9df3535b625b8609dfc167e (diff) | |
parent | fd4d3cff880e9131d55a4e534c17289db5f72b6b (diff) | |
download | dexon-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/multisig/test')
-rw-r--r-- | contracts/multisig/test/asset_proxy_owner.ts | 6 | ||||
-rw-r--r-- | contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/contracts/multisig/test/asset_proxy_owner.ts b/contracts/multisig/test/asset_proxy_owner.ts index 62081554b..7bf4069cb 100644 --- a/contracts/multisig/test/asset_proxy_owner.ts +++ b/contracts/multisig/test/asset_proxy_owner.ts @@ -1,4 +1,3 @@ -import { artifacts as proxyArtifacts, MixinAuthorizableContract } from '@0x/contracts-asset-proxy'; import { chaiSetup, constants, @@ -26,6 +25,7 @@ import { AssetProxyOwnerExecutionFailureEventArgs, AssetProxyOwnerSubmissionEventArgs, AssetProxyOwnerWrapper, + MixinAuthorizableContract, TestAssetProxyOwnerContract, } from '../src'; @@ -58,12 +58,12 @@ describe('AssetProxyOwner', () => { notOwner = accounts[3]; const initialOwner = accounts[0]; erc20Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync( - proxyArtifacts.MixinAuthorizable, + artifacts.MixinAuthorizable, provider, txDefaults, ); erc721Proxy = await MixinAuthorizableContract.deployFrom0xArtifactAsync( - proxyArtifacts.MixinAuthorizable, + artifacts.MixinAuthorizable, provider, txDefaults, ); diff --git a/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts b/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts index b6040d8e3..d5aaaf519 100644 --- a/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts +++ b/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts @@ -1,5 +1,3 @@ -import { artifacts as proxyArtifacts } from '@0x/contracts-asset-proxy'; -import { artifacts as erc20Artifacts } from '@0x/contracts-erc20'; import { LogDecoder } from '@0x/contracts-test-utils'; import { BigNumber } from '@0x/utils'; import { Web3Wrapper } from '@0x/web3-wrapper'; @@ -16,7 +14,7 @@ export class AssetProxyOwnerWrapper { constructor(assetproxyOwnerContract: AssetProxyOwnerContract, provider: Provider) { this._assetProxyOwner = assetproxyOwnerContract; this._web3Wrapper = new Web3Wrapper(provider); - this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...proxyArtifacts }); + this._logDecoder = new LogDecoder(this._web3Wrapper, artifacts); } public async submitTransactionAsync( destination: string, |