Merge pull request #1105 from 0xProject/feature/contracts-artifacts-re-org

Reorganize and modularize generated contract wrappers and artifacts

2 files changed, 5 insertions, 19 deletions

diff --git a/packages/asset-buyer/src/asset_buyer.ts b/packages/asset-buyer/src/asset_buyer.ts
index 50343efde..4739e5a29 100644
--- a/packages/asset-buyer/src/asset_buyer.ts
+++ b/packages/asset-buyer/src/asset_buyer.ts
@@ -283,13 +283,13 @@ export class AssetBuyer {
      * Will throw if WETH does not exist for the current network.
      */
     private _getEtherTokenAssetDataOrThrow(): string {
-        return assetDataUtils.getEtherTokenAssetDataOrThrow(this._contractWrappers);
+        return assetDataUtils.getEtherTokenAssetData(this._contractWrappers);
     }
     /**
      * Get the assetData that represents the ZRX token.
      * Will throw if ZRX does not exist for the current network.
      */
     private _getZrxTokenAssetDataOrThrow(): string {
-        return assetDataUtils.getZrxTokenAssetDataOrThrow(this._contractWrappers);
+        return this._contractWrappers.exchange.getZRXAssetData();
     }
 }
diff --git a/packages/asset-buyer/src/utils/asset_data_utils.ts b/packages/asset-buyer/src/utils/asset_data_utils.ts
index d05ff2504..f54462a23 100644
--- a/packages/asset-buyer/src/utils/asset_data_utils.ts
+++ b/packages/asset-buyer/src/utils/asset_data_utils.ts
@@ -2,25 +2,11 @@ import { ContractWrappers } from '@0xproject/contract-wrappers';
 import { assetDataUtils as sharedAssetDataUtils } from '@0xproject/order-utils';
 import * as _ from 'lodash';
 
-import { AssetBuyerError } from '../types';
-
 export const assetDataUtils = {
     ...sharedAssetDataUtils,
-    getEtherTokenAssetDataOrThrow(contractWrappers: ContractWrappers): string {
-        const etherTokenAddressIfExists = contractWrappers.etherToken.getContractAddressIfExists();
-        if (_.isUndefined(etherTokenAddressIfExists)) {
-            throw new Error(AssetBuyerError.NoEtherTokenContractFound);
-        }
-        const etherTokenAssetData = sharedAssetDataUtils.encodeERC20AssetData(etherTokenAddressIfExists);
+    getEtherTokenAssetData(contractWrappers: ContractWrappers): string {
+        const etherTokenAddress = contractWrappers.forwarder.etherTokenAddress;
+        const etherTokenAssetData = sharedAssetDataUtils.encodeERC20AssetData(etherTokenAddress);
         return etherTokenAssetData;
     },
-    getZrxTokenAssetDataOrThrow(contractWrappers: ContractWrappers): string {
-        let zrxTokenAssetData: string;
-        try {
-            zrxTokenAssetData = contractWrappers.exchange.getZRXAssetData();
-        } catch (err) {
-            throw new Error(AssetBuyerError.NoZrxTokenContractFound);
-        }
-        return zrxTokenAssetData;
-    },
 };