Split tokens package into erc20 and erc721

7 files changed, 17 insertions, 13 deletions

diff --git a/contracts/multisig/package.json b/contracts/multisig/package.json
index ec6bf5367..b56a711d2 100644
--- a/contracts/multisig/package.json
+++ b/contracts/multisig/package.json
@@ -71,7 +71,7 @@
     "dependencies": {
         "@0x/base-contract": "^3.0.13",
         "@0x/contracts-asset-proxy": "^2.2.3",
-        "@0x/contracts-tokens": "^1.0.6",
+        "@0x/contracts-erc20": "^1.0.6",
         "@0x/order-utils": "^3.1.2",
         "@0x/types": "^1.5.2",
         "@0x/typescript-typings": "^3.0.8",
diff --git a/contracts/multisig/src/index.ts b/contracts/multisig/src/index.ts
index d55f08ea2..ba813e7ca 100644
--- a/contracts/multisig/src/index.ts
+++ b/contracts/multisig/src/index.ts
@@ -1,2 +1,3 @@
 export * from './artifacts';
 export * from './wrappers';
+export * from '../test/utils';
diff --git a/contracts/multisig/src/wrappers/index.ts b/contracts/multisig/src/wrappers/index.ts
index 69abd62f2..43ab25704 100644
--- a/contracts/multisig/src/wrappers/index.ts
+++ b/contracts/multisig/src/wrappers/index.ts
@@ -1,2 +1,5 @@
+export * from '../../generated-wrappers/asset_proxy_owner';
 export * from '../../generated-wrappers/multi_sig_wallet';
 export * from '../../generated-wrappers/multi_sig_wallet_with_time_lock';
+export * from '../../generated-wrappers/test_asset_proxy_owner';
+export * from '../../generated-wrappers/test_reject_ether';
diff --git a/contracts/multisig/test/asset_proxy_owner.ts b/contracts/multisig/test/asset_proxy_owner.ts
index c7b7d997b..62081554b 100644
--- a/contracts/multisig/test/asset_proxy_owner.ts
+++ b/contracts/multisig/test/asset_proxy_owner.ts
@@ -19,16 +19,15 @@ import * as chai from 'chai';
 import { LogWithDecodedArgs } from 'ethereum-types';
 
 import {
+    artifacts,
     AssetProxyOwnerAssetProxyRegistrationEventArgs,
     AssetProxyOwnerContract,
     AssetProxyOwnerExecutionEventArgs,
     AssetProxyOwnerExecutionFailureEventArgs,
     AssetProxyOwnerSubmissionEventArgs,
-} from '../generated-wrappers/asset_proxy_owner';
-import { TestAssetProxyOwnerContract } from '../generated-wrappers/test_asset_proxy_owner';
-import { artifacts } from '../src/artifacts';
-
-import { AssetProxyOwnerWrapper } from './utils/asset_proxy_owner_wrapper';
+    AssetProxyOwnerWrapper,
+    TestAssetProxyOwnerContract,
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/multisig/test/multi_sig_with_time_lock.ts b/contracts/multisig/test/multi_sig_with_time_lock.ts
index 31c215505..b9b3732a7 100644
--- a/contracts/multisig/test/multi_sig_with_time_lock.ts
+++ b/contracts/multisig/test/multi_sig_with_time_lock.ts
@@ -16,17 +16,16 @@ import { LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
 import {
+    artifacts,
     MultiSigWalletWithTimeLockConfirmationEventArgs,
     MultiSigWalletWithTimeLockConfirmationTimeSetEventArgs,
     MultiSigWalletWithTimeLockContract,
     MultiSigWalletWithTimeLockExecutionEventArgs,
     MultiSigWalletWithTimeLockExecutionFailureEventArgs,
     MultiSigWalletWithTimeLockSubmissionEventArgs,
-} from '../generated-wrappers/multi_sig_wallet_with_time_lock';
-import { TestRejectEtherContract } from '../generated-wrappers/test_reject_ether';
-import { artifacts } from '../src/artifacts';
-
-import { MultiSigWrapper } from './utils/multi_sig_wrapper';
+    MultiSigWrapper,
+    TestRejectEtherContract,
+} from '../src';
 
 chaiSetup.configure();
 const expect = chai.expect;
diff --git a/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts b/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts
index 924a215db..b6040d8e3 100644
--- a/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts
+++ b/contracts/multisig/test/utils/asset_proxy_owner_wrapper.ts
@@ -1,6 +1,6 @@
 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 { artifacts as tokensArtifacts } from '@0x/contracts-tokens';
 import { BigNumber } from '@0x/utils';
 import { Web3Wrapper } from '@0x/web3-wrapper';
 import { Provider, TransactionReceiptWithDecodedLogs } from 'ethereum-types';
@@ -16,7 +16,7 @@ export class AssetProxyOwnerWrapper {
     constructor(assetproxyOwnerContract: AssetProxyOwnerContract, provider: Provider) {
         this._assetProxyOwner = assetproxyOwnerContract;
         this._web3Wrapper = new Web3Wrapper(provider);
-        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...tokensArtifacts, ...proxyArtifacts });
+        this._logDecoder = new LogDecoder(this._web3Wrapper, { ...artifacts, ...erc20Artifacts, ...proxyArtifacts });
     }
     public async submitTransactionAsync(
         destination: string,
diff --git a/contracts/multisig/test/utils/index.ts b/contracts/multisig/test/utils/index.ts
new file mode 100644
index 000000000..382fd92e5
--- /dev/null
+++ b/contracts/multisig/test/utils/index.ts
@@ -0,0 +1,2 @@
+export * from './asset_proxy_owner_wrapper';
+export * from './multi_sig_wrapper';