Minor fixes after rebase

packages/contracts/test/asset_proxy/proxies.ts

@@ -226,13 +226,9 @@ describe('Asset Transfer Proxies', () => {
                 const amounts = _.times(numTransfers, () => amount);
 
                 return expectRevertOrAlwaysFailingTransactionAsync(
-                    erc20Proxy.batchTransferFrom.sendTransactionAsync(
-                        encodedAssetData,
-                        fromAddresses,
-                        toAddresses,
-                        amounts,
-                        { from: notAuthorized },
-                    ),
+                    erc20Proxy.batchTransferFrom.sendTransactionAsync(assetData, fromAddresses, toAddresses, amounts, {
+                        from: notAuthorized,
+                    }),
                 );
             });
         });
@@ -477,13 +473,9 @@ describe('Asset Transfer Proxies', () => {
                 const amounts = _.times(numTransfers, () => new BigNumber(1));
 
                 return expectRevertOrAlwaysFailingTransactionAsync(
-                    erc721Proxy.batchTransferFrom.sendTransactionAsync(
-                        encodedAssetData,
-                        fromAddresses,
-                        toAddresses,
-                        amounts,
-                        { from: notAuthorized },
-                    ),
+                    erc721Proxy.batchTransferFrom.sendTransactionAsync(assetData, fromAddresses, toAddresses, amounts, {
+                        from: notAuthorized,
+                    }),
                 );
             });
         });

packages/fill-scenarios/src/index.ts

@@ -169,10 +169,10 @@ export class FillScenarios {
         feeRecepientAddress: string,
         expirationTimeSeconds?: BigNumber,
     ): Promise<SignedOrder> {
-        const makerERC20ProxyData = assetProxyUtils.decodeERC20ProxyData(makerAssetData);
-        const makerTokenAddress = makerERC20ProxyData.tokenAddress;
-        const takerERC20ProxyData = assetProxyUtils.decodeERC20ProxyData(takerAssetData);
-        const takerTokenAddress = takerERC20ProxyData.tokenAddress;
+        const makerERC20AssetData = assetProxyUtils.decodeERC20AssetData(makerAssetData);
+        const makerTokenAddress = makerERC20AssetData.tokenAddress;
+        const takerERC20AssetData = assetProxyUtils.decodeERC20AssetData(takerAssetData);
+        const takerTokenAddress = takerERC20AssetData.tokenAddress;
         await Promise.all([
             this._increaseERC20BalanceAndAllowanceAsync(makerTokenAddress, makerAddress, makerFillableAmount),
             this._increaseERC20BalanceAndAllowanceAsync(takerTokenAddress, takerAddress, takerFillableAmount),