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/multisig/test/utils/asset_proxy_owner_wrapper.ts | |
parent | f118e86cfe478f95eb0450df351871e8278862c3 (diff) | |
parent | 2ef3af000378f66daa0212daaf23c807d018711e (diff) | |
download | dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar.gz dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar.bz2 dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar.lz dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar.xz dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.tar.zst dexon-0x-contracts-7a9ff3846ecbfbdbe5ace374563deea50c15bc45.zip |
Merge development
Diffstat (limited to 'contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts')
-rw-r--r-- | contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts | 4 |
1 files changed, 1 insertions, 3 deletions
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, |