4 files changed, 3 insertions, 18 deletions
diff --git a/packages/contracts/src/abstract/abstract_asset_wrapper.ts b/packages/contracts/src/abstract/abstract_asset_wrapper.ts
index 521335f18..0a0b42eea 100644
--- a/packages/contracts/src/abstract/abstract_asset_wrapper.ts
+++ b/packages/contracts/src/abstract/abstract_asset_wrapper.ts
@@ -1,5 +1,3 @@
-import { BigNumber } from '@0xproject/utils';
-
 export abstract class AbstractAssetWrapper {
     public abstract getProxyId(): number;
 }
diff --git a/packages/contracts/src/utils/asset_wrapper.ts b/packages/contracts/src/utils/asset_wrapper.ts
index 9c683054d..d5ce8cf1e 100644
--- a/packages/contracts/src/utils/asset_wrapper.ts
+++ b/packages/contracts/src/utils/asset_wrapper.ts
@@ -113,7 +113,6 @@ export class AssetWrapper {
                 const isProxyApprovedForAll = await assetWrapper.isProxyApprovedForAllAsync(
                     userAddress,
                     erc721ProxyData.tokenAddress,
-                    erc721ProxyData.tokenId,
                 );
                 if (isProxyApprovedForAll) {
                     return constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS;
@@ -169,7 +168,6 @@ export class AssetWrapper {
                 const isProxyApprovedForAll = await erc721Wrapper.isProxyApprovedForAllAsync(
                     userAddress,
                     assetProxyData.tokenAddress,
-                    assetProxyData.tokenId,
                 );
                 if (!isProxyApprovedForAll && desiredAllowance.eq(constants.UNLIMITED_ALLOWANCE_IN_BASE_UNITS)) {
                     const isApproved = true;
diff --git a/packages/contracts/src/utils/core_combinatorial_utils.ts b/packages/contracts/src/utils/core_combinatorial_utils.ts
index aea9a65e7..a2d2a500b 100644
--- a/packages/contracts/src/utils/core_combinatorial_utils.ts
+++ b/packages/contracts/src/utils/core_combinatorial_utils.ts
@@ -6,11 +6,11 @@ import {
     OrderStateUtils,
     OrderValidationUtils,
 } from '@0xproject/order-utils';
-import { AssetProxyId, Order, SignatureType, SignedOrder } from '@0xproject/types';
+import { AssetProxyId, SignatureType, SignedOrder } from '@0xproject/types';
 import { BigNumber, errorUtils, logUtils } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import * as chai from 'chai';
-import { BlockParamLiteral, LogWithDecodedArgs, Provider, TxData } from 'ethereum-types';
+import { LogWithDecodedArgs, Provider, TxData } from 'ethereum-types';
 import * as _ from 'lodash';
 import 'make-promises-safe';
 
@@ -36,7 +36,6 @@ import {
     FeeRecipientAddressScenario,
     FillScenario,
     OrderAssetAmountScenario,
-    OrderScenario,
     TakerAssetFillAmountScenario,
     TakerScenario,
     TraderStateScenario,
@@ -290,7 +289,6 @@ export class CoreCombinatorialUtils {
             fillScenario.takerStateScenario,
             signedOrder,
             takerAssetFillAmount,
-            balanceAndProxyAllowanceFetcher,
         );
 
         // 5. If I fill it by X, what are the resulting balances/allowances/filled amounts expected?
@@ -325,7 +323,6 @@ export class CoreCombinatorialUtils {
             takerAssetFillAmount,
             lazyStore,
             fillRevertReasonIfExists,
-            provider,
         );
     }
     private async _fillOrderAndAssertOutcomeAsync(
@@ -333,7 +330,6 @@ export class CoreCombinatorialUtils {
         takerAssetFillAmount: BigNumber,
         lazyStore: BalanceAndProxyAllowanceLazyStore,
         fillRevertReasonIfExists: string | undefined,
-        provider: Provider,
     ): Promise<void> {
         if (!_.isUndefined(fillRevertReasonIfExists)) {
             return expectRevertReasonOrAlwaysFailingTransactionAsync(
@@ -375,11 +371,6 @@ export class CoreCombinatorialUtils {
             signedOrder.makerAssetAmount,
         );
 
-        const beforeMakerAssetAllowanceOfMaker = await this.assetWrapper.getProxyAllowanceAsync(
-            makerAddress,
-            makerAssetData,
-        );
-
         // - Let's fill the order!
         const txReceipt = await this.exchangeWrapper.fillOrderAsync(signedOrder, this.takerAddress, {
             takerAssetFillAmount,
@@ -544,7 +535,6 @@ export class CoreCombinatorialUtils {
         takerStateScenario: TraderStateScenario,
         signedOrder: SignedOrder,
         takerAssetFillAmount: BigNumber,
-        balanceAndProxyAllowanceFetcher: SimpleAssetBalanceAndProxyAllowanceFetcher,
     ): Promise<void> {
         const makerAssetFillAmount = orderUtils.getPartialAmount(
             takerAssetFillAmount,
diff --git a/packages/contracts/src/utils/erc721_wrapper.ts b/packages/contracts/src/utils/erc721_wrapper.ts
index 6df9fa12e..e83e845a0 100644
--- a/packages/contracts/src/utils/erc721_wrapper.ts
+++ b/packages/contracts/src/utils/erc721_wrapper.ts
@@ -1,4 +1,4 @@
-import { assetProxyUtils, generatePseudoRandomSalt } from '@0xproject/order-utils';
+import { generatePseudoRandomSalt } from '@0xproject/order-utils';
 import { BigNumber } from '@0xproject/utils';
 import { Web3Wrapper } from '@0xproject/web3-wrapper';
 import { Provider } from 'ethereum-types';
@@ -155,7 +155,6 @@ export class ERC721Wrapper {
     public async isProxyApprovedForAllAsync(
         userAddress: string,
         tokenAddress: string,
-        tokenId: BigNumber,
     ): Promise<boolean> {
         this._validateProxyContractExistsOrThrow();
         const tokenContract = this._getTokenContractFromAssetData(tokenAddress);