Stop passing exchangeContractAddress to utils.getOrderHashHex

3 files changed, 5 insertions, 10 deletions

diff --git a/src/0x.ts b/src/0x.ts
index 615702957..a95257db6 100644
--- a/src/0x.ts
+++ b/src/0x.ts
@@ -182,7 +182,7 @@ export class ZeroEx {
      */
     public getOrderHashHex(order: Order|SignedOrder): string {
         assert.doesConformToSchema('order', order, orderSchema);
-        const orderHashHex = utils.getOrderHashHex(order, order.exchangeContractAddress);
+        const orderHashHex = utils.getOrderHashHex(order);
         return orderHashHex;
     }
     /**
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index fa946d6ad..f596cb429 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -679,11 +679,6 @@ export class ExchangeWrapper extends ContractWrapper {
         );
         return isValidSignature;
     }
-    private async _getOrderHashHexAsync(order: Order|SignedOrder): Promise<string> {
-        const exchangeInstance = await this._getExchangeContractAsync(order.exchangeContractAddress);
-        const orderHashHex = utils.getOrderHashHex(order, exchangeInstance.address);
-        return orderHashHex;
-    }
     private async _getOrderHashHexUsingContractCallAsync(order: Order|SignedOrder): Promise<string> {
         const exchangeInstance = await this._getExchangeContractAsync(order.exchangeContractAddress);
         const [orderAddresses, orderValues] = ExchangeWrapper._getOrderAddressesAndValues(order);
@@ -720,7 +715,7 @@ export class ExchangeWrapper extends ContractWrapper {
         if (takerTokenCancelAmount.eq(0)) {
             throw new Error(ExchangeContractErrs.ORDER_CANCEL_AMOUNT_ZERO);
         }
-        const orderHash = await this._getOrderHashHexAsync(order);
+        const orderHash = utils.getOrderHashHex(order);
         const unavailableAmount = await this.getUnavailableTakerAmountAsync(orderHash, order.exchangeContractAddress);
         if (order.takerTokenAmount.minus(unavailableAmount).eq(0)) {
             throw new Error(ExchangeContractErrs.ORDER_ALREADY_CANCELLED_OR_FILLED);
@@ -734,7 +729,7 @@ export class ExchangeWrapper extends ContractWrapper {
                                                                  exchangeContractAddress: string,
                                                                  fillTakerAmount: BigNumber.BigNumber) {
         // Check that fillValue available >= fillTakerAmount
-        const orderHashHex = utils.getOrderHashHex(signedOrder, exchangeContractAddress);
+        const orderHashHex = utils.getOrderHashHex(signedOrder);
         const unavailableTakerAmount = await this.getUnavailableTakerAmountAsync(orderHashHex, exchangeContractAddress);
         const remainingTakerAmount = signedOrder.takerTokenAmount.minus(unavailableTakerAmount);
         if (remainingTakerAmount < fillTakerAmount) {
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index bad5b6498..a20fa2243 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -29,9 +29,9 @@ export const utils = {
     spawnSwitchErr(name: string, value: any): Error {
         return new Error(`Unexpected switch value: ${value} encountered for ${name}`);
     },
-    getOrderHashHex(order: Order|SignedOrder, exchangeContractAddr: string): string {
+    getOrderHashHex(order: Order|SignedOrder): string {
         const orderParts = [
-            {value: exchangeContractAddr, type: SolidityTypes.address},
+            {value: order.exchangeContractAddress, type: SolidityTypes.address},
             {value: order.maker, type: SolidityTypes.address},
             {value: order.taker, type: SolidityTypes.address},
             {value: order.makerTokenAddress, type: SolidityTypes.address},