3 files changed, 5 insertions, 11 deletions
diff --git a/src/0x.js.ts b/src/0x.js.ts
index fa52d4ad8..7b53b70ea 100644
--- a/src/0x.js.ts
+++ b/src/0x.js.ts
@@ -16,6 +16,8 @@ import {ecSignatureSchema} from './schemas/ec_signature_schema';
 import {TokenWrapper} from './contract_wrappers/token_wrapper';
 import {ECSignature, ZeroExError, Order, SignedOrder} from './types';
 import * as ExchangeArtifacts from './artifacts/Exchange.json';
+import {SchemaValidator} from './utils/schema_validator';
+import {orderSchema} from './schemas/order_schemas';
 
 // Customize our BigNumber instances
 bigNumberConfigs.configure();
@@ -128,6 +130,8 @@ export class ZeroEx {
      * Computes the orderHash for a given order and returns it as a hex encoded string.
      */
     public async getOrderHashHexAsync(order: Order|SignedOrder): Promise<string> {
+        assert.doesConformToSchema(
+            'order', SchemaValidator.convertToJSONSchemaCompatibleObject(order as object), orderSchema);
         const exchangeContractAddr = await this.getExchangeAddressAsync();
         const hashHex = utils.getOrderHashHex(order, exchangeContractAddr);
         return hashHex;
diff --git a/src/contract_wrappers/exchange_wrapper.ts b/src/contract_wrappers/exchange_wrapper.ts
index fe03dbd16..6f62934dc 100644
--- a/src/contract_wrappers/exchange_wrapper.ts
+++ b/src/contract_wrappers/exchange_wrapper.ts
@@ -231,10 +231,7 @@ export class ExchangeWrapper extends ContractWrapper {
         logEventObj.watch(callback);
         this.exchangeLogEventObjs.push(logEventObj);
     }
-    /**
-     * Computes the orderHash for a given order and returns it as a hex encoded string.
-     */
-    public async getOrderHashAsync(order: Order|SignedOrder): Promise<string> {
+    private async getOrderHashAsync(order: Order|SignedOrder): Promise<string> {
         const [orderAddresses, orderValues] = ExchangeWrapper.getOrderAddressesAndValues(order);
         const exchangeInstance = await this.getExchangeContractAsync();
         const orderHash = utils.getOrderHashHex(order, exchangeInstance.address);
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 0da83c366..5786bab07 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -2,10 +2,7 @@ import * as _ from 'lodash';
 import * as BN from 'bn.js';
 import * as ethABI from 'ethereumjs-abi';
 import * as ethUtil from 'ethereumjs-util';
-import {orderSchema} from '../schemas/order_schemas';
-import {SchemaValidator} from './schema_validator';
 import {Order, SignedOrder, SolidityTypes} from '../types';
-import {assert} from './assert';
 import * as BigNumber from 'bignumber.js';
 
 export const utils = {
@@ -33,10 +30,6 @@ export const utils = {
         return new Error(`Unexpected switch value: ${value} encountered for ${name}`);
     },
     getOrderHashHex(order: Order|SignedOrder, exchangeContractAddr: string): string {
-        assert.doesConformToSchema('order',
-            SchemaValidator.convertToJSONSchemaCompatibleObject(order as object),
-            orderSchema);
-
         const orderParts = [
             {value: exchangeContractAddr, type: SolidityTypes.address},
             {value: order.maker, type: SolidityTypes.address},