merge v2-prototype

1 files changed, 9 insertions, 9 deletions

diff --git a/packages/contracts/test/utils/forwarder_wrapper.ts b/packages/contracts/test/utils/forwarder_wrapper.ts
index d227420ee..e39df14b1 100644
--- a/packages/contracts/test/utils/forwarder_wrapper.ts
+++ b/packages/contracts/test/utils/forwarder_wrapper.ts
@@ -1,4 +1,4 @@
-import { assetProxyUtils } from '@0xproject/order-utils';
+import { assetDataUtils } from '@0xproject/order-utils';
 import { AssetProxyId, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
@@ -18,13 +18,13 @@ const ZERO_AMOUNT = new BigNumber(0);
 const INSUFFICENT_ORDERS_FOR_MAKER_AMOUNT = 'Unable to satisfy makerAssetFillAmount with provided orders';
 
 export class ForwarderWrapper {
-    private _web3Wrapper: Web3Wrapper;
-    private _forwarderContract: ForwarderContract;
-    private _logDecoder: LogDecoder;
-    private _zrxAddress: string;
+    private readonly _web3Wrapper: Web3Wrapper;
+    private readonly _forwarderContract: ForwarderContract;
+    private readonly _logDecoder: LogDecoder;
+    private readonly _zrxAddress: string;
     private static _createOptimizedSellOrders(signedOrders: SignedOrder[]): MarketSellOrders {
         const marketSellOrders = formatters.createMarketSellOrders(signedOrders, ZERO_AMOUNT);
-        const assetDataId = assetProxyUtils.decodeAssetDataId(signedOrders[0].makerAssetData);
+        const assetDataId = assetDataUtils.decodeAssetProxyId(signedOrders[0].makerAssetData);
         // Contract will fill this in for us as all of the assetData is assumed to be the same
         for (let i = 0; i < signedOrders.length; i++) {
             if (i !== 0 && assetDataId === AssetProxyId.ERC20) {
@@ -90,7 +90,7 @@ export class ForwarderWrapper {
         txData: TxDataPayable,
         opts: { feeProportion?: number; feeRecipient?: string } = {},
     ): Promise<TransactionReceiptWithDecodedLogs> {
-        const assetDataId = assetProxyUtils.decodeAssetDataId(orders[0].makerAssetData);
+        const assetDataId = assetDataUtils.decodeAssetProxyId(orders[0].makerAssetData);
         if (assetDataId !== AssetProxyId.ERC20) {
             throw new Error('Asset type not supported by marketSellEthForERC20');
         }
@@ -116,7 +116,7 @@ export class ForwarderWrapper {
         feeProportion: number,
         makerAssetFillAmount: BigNumber,
     ): Promise<BigNumber> {
-        const assetProxyId = assetProxyUtils.decodeAssetDataId(orders[0].makerAssetData);
+        const assetProxyId = assetDataUtils.decodeAssetProxyId(orders[0].makerAssetData);
         switch (assetProxyId) {
             case AssetProxyId.ERC20: {
                 const fillAmountWei = this._calculateMarketBuyERC20FillAmountAsync(
@@ -145,7 +145,7 @@ export class ForwarderWrapper {
         feeProportion: number,
         makerAssetFillAmount: BigNumber,
     ): Promise<BigNumber> {
-        const makerAssetData = assetProxyUtils.decodeAssetData(orders[0].makerAssetData);
+        const makerAssetData = assetDataUtils.decodeAssetDataOrThrow(orders[0].makerAssetData);
         const makerAssetToken = makerAssetData.tokenAddress;
         const params = formatters.createMarketBuyOrders(orders, makerAssetFillAmount);