Update contract-wrappers package to use new contracts package for generated files

1 files changed, 10 insertions, 11 deletions

diff --git a/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts b/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts
index 4625cef6a..3be5bcaee 100644
--- a/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts
+++ b/packages/contract-wrappers/src/contract_wrappers/erc20_token_wrapper.ts
@@ -1,10 +1,10 @@
+import { artifacts, wrappers } from '@0xproject/contracts';
 import { schemas } from '@0xproject/json-schemas';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { ContractAbi, LogWithDecodedArgs } from 'ethereum-types';
 import * as _ from 'lodash';
 
-import { artifacts } from '../artifacts';
 import { methodOptsSchema } from '../schemas/method_opts_schema';
 import { txOptsSchema } from '../schemas/tx_opts_schema';
 import {
@@ -20,7 +20,6 @@ import { constants } from '../utils/constants';
 
 import { ContractWrapper } from './contract_wrapper';
 import { ERC20ProxyWrapper } from './erc20_proxy_wrapper';
-import { ERC20TokenContract, ERC20TokenEventArgs, ERC20TokenEvents } from './generated/erc20_token';
 
 const removeUndefinedProperties = _.pickBy;
 
@@ -32,7 +31,7 @@ const removeUndefinedProperties = _.pickBy;
 export class ERC20TokenWrapper extends ContractWrapper {
     public abi: ContractAbi = artifacts.ERC20Token.compilerOutput.abi;
     public UNLIMITED_ALLOWANCE_IN_BASE_UNITS = constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
-    private _tokenContractsByAddress: { [address: string]: ERC20TokenContract };
+    private _tokenContractsByAddress: { [address: string]: wrappers.ERC20TokenContract };
     private _erc20ProxyWrapper: ERC20ProxyWrapper;
     /**
      * Instantiate ERC20TokenWrapper
@@ -357,15 +356,15 @@ export class ERC20TokenWrapper extends ContractWrapper {
      * @param   isVerbose           Enable verbose subscription warnings (e.g recoverable network issues encountered)
      * @return Subscription token used later to unsubscribe
      */
-    public subscribe<ArgsType extends ERC20TokenEventArgs>(
+    public subscribe<ArgsType extends wrappers.ERC20TokenEventArgs>(
         tokenAddress: string,
-        eventName: ERC20TokenEvents,
+        eventName: wrappers.ERC20TokenEvents,
         indexFilterValues: IndexedFilterValues,
         callback: EventCallback<ArgsType>,
         isVerbose: boolean = false,
     ): string {
         assert.isETHAddressHex('tokenAddress', tokenAddress);
-        assert.doesBelongToStringEnum('eventName', eventName, ERC20TokenEvents);
+        assert.doesBelongToStringEnum('eventName', eventName, wrappers.ERC20TokenEvents);
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         assert.isFunction('callback', callback);
         const normalizedTokenAddress = tokenAddress.toLowerCase();
@@ -402,14 +401,14 @@ export class ERC20TokenWrapper extends ContractWrapper {
      *                              the value is the value you are interested in. E.g `{_from: aUserAddressHex}`
      * @return  Array of logs that match the parameters
      */
-    public async getLogsAsync<ArgsType extends ERC20TokenEventArgs>(
+    public async getLogsAsync<ArgsType extends wrappers.ERC20TokenEventArgs>(
         tokenAddress: string,
-        eventName: ERC20TokenEvents,
+        eventName: wrappers.ERC20TokenEvents,
         blockRange: BlockRange,
         indexFilterValues: IndexedFilterValues,
     ): Promise<Array<LogWithDecodedArgs<ArgsType>>> {
         assert.isETHAddressHex('tokenAddress', tokenAddress);
-        assert.doesBelongToStringEnum('eventName', eventName, ERC20TokenEvents);
+        assert.doesBelongToStringEnum('eventName', eventName, wrappers.ERC20TokenEvents);
         assert.doesConformToSchema('blockRange', blockRange, schemas.blockRangeSchema);
         assert.doesConformToSchema('indexFilterValues', indexFilterValues, schemas.indexFilterValuesSchema);
         const normalizedTokenAddress = tokenAddress.toLowerCase();
@@ -429,7 +428,7 @@ export class ERC20TokenWrapper extends ContractWrapper {
         this.unsubscribeAll();
         this._tokenContractsByAddress = {};
     }
-    private async _getTokenContractAsync(tokenAddress: string): Promise<ERC20TokenContract> {
+    private async _getTokenContractAsync(tokenAddress: string): Promise<wrappers.ERC20TokenContract> {
         const normalizedTokenAddress = tokenAddress.toLowerCase();
         let tokenContract = this._tokenContractsByAddress[normalizedTokenAddress];
         if (!_.isUndefined(tokenContract)) {
@@ -439,7 +438,7 @@ export class ERC20TokenWrapper extends ContractWrapper {
             artifacts.ERC20Token,
             normalizedTokenAddress,
         );
-        const contractInstance = new ERC20TokenContract(
+        const contractInstance = new wrappers.ERC20TokenContract(
             abi,
             address,
             this._web3Wrapper.getProvider(),