From d907b403788576c7d4fe51090a561f1e951126e2 Mon Sep 17 00:00:00 2001
From: Fabio Berger <me@fabioberger.com>
Date: Wed, 22 Aug 2018 13:12:42 +0100
Subject: Fix remaining merge issues

---
 packages/contract-wrappers/src/index.ts                     | 2 ++
 packages/contract-wrappers/src/utils/transaction_encoder.ts | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'packages/contract-wrappers/src')

diff --git a/packages/contract-wrappers/src/index.ts b/packages/contract-wrappers/src/index.ts
index 941aa1e40..5e691fc21 100644
--- a/packages/contract-wrappers/src/index.ts
+++ b/packages/contract-wrappers/src/index.ts
@@ -7,6 +7,8 @@ export { ERC20ProxyWrapper } from './contract_wrappers/erc20_proxy_wrapper';
 export { ERC721ProxyWrapper } from './contract_wrappers/erc721_proxy_wrapper';
 export { ForwarderWrapper } from './contract_wrappers/forwarder_wrapper';
 
+export { TransactionEncoder } from './utils/transaction_encoder';
+
 export {
     ContractWrappersError,
     IndexedFilterValues,
diff --git a/packages/contract-wrappers/src/utils/transaction_encoder.ts b/packages/contract-wrappers/src/utils/transaction_encoder.ts
index 5c2a94b74..8821079dc 100644
--- a/packages/contract-wrappers/src/utils/transaction_encoder.ts
+++ b/packages/contract-wrappers/src/utils/transaction_encoder.ts
@@ -1,5 +1,5 @@
 import { schemas } from '@0xproject/json-schemas';
-import { EIP712Schema, EIP712Types, EIP712Utils } from '@0xproject/order-utils';
+import { EIP712Schema, EIP712Types, eip712Utils } from '@0xproject/order-utils';
 import { Order, SignedOrder } from '@0xproject/types';
 import { BigNumber } from '@0xproject/utils';
 import _ = require('lodash');
@@ -41,11 +41,11 @@ export class TransactionEncoder {
             signerAddress,
             data,
         };
-        const executeTransactionHashBuff = EIP712Utils.structHash(
+        const executeTransactionHashBuff = eip712Utils.structHash(
             EIP712_ZEROEX_TRANSACTION_SCHEMA,
             executeTransactionData,
         );
-        const eip721MessageBuffer = EIP712Utils.createEIP712Message(executeTransactionHashBuff, exchangeAddress);
+        const eip721MessageBuffer = eip712Utils.createEIP712Message(executeTransactionHashBuff, exchangeAddress);
         const messageHex = `0x${eip721MessageBuffer.toString('hex')}`;
         return messageHex;
     }
-- 
cgit v1.2.3