From 32867c9a07fc7c833ff8491ec4feea8c783e7f4d Mon Sep 17 00:00:00 2001
From: Leonid Logvinov <logvinov.leon@gmail.com>
Date: Mon, 27 Nov 2017 16:03:57 -0600
Subject: Fix merge conflicts

---
 packages/0x.js/src/contract_wrappers/contract_wrapper.ts | 2 +-
 packages/0x.js/src/contract_wrappers/exchange_wrapper.ts | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'packages/0x.js/src/contract_wrappers')

diff --git a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
index 395d974b2..8c92931b4 100644
--- a/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/contract_wrapper.ts
@@ -153,7 +153,7 @@ export class ContractWrapper {
             // We need to coerce to Block type cause Web3.Block includes types for mempool blocks
             if (!_.isUndefined(this._blockAndLogStreamer)) {
                 // If we clear the interval while fetching the block - this._blockAndLogStreamer will be undefined
-                this._blockAndLogStreamer.reconcileNewBlock(latestBlock as any as Block);
+                await this._blockAndLogStreamer.reconcileNewBlock(latestBlock as any as Block);
             }
         } catch (err) {
             const filterTokens = _.keys(this._filterCallbacks);
diff --git a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
index cd38c78fc..91b41c4a4 100644
--- a/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
+++ b/packages/0x.js/src/contract_wrappers/exchange_wrapper.ts
@@ -5,6 +5,7 @@ import * as Web3 from 'web3';
 
 import {artifacts} from '../artifacts';
 import {
+    BlockParamLiteral,
     DecodedLogArgs,
     ECSignature,
     EventCallback,
@@ -26,10 +27,9 @@ import {
     OrderTransactionOpts,
     OrderValues,
     RawLog,
-    EventCallback,
-    ExchangeContractEventArgs,
-    DecodedLogArgs,
-    BlockParamLiteral,
+    SignedOrder,
+    SubscriptionOpts,
+    ValidateOrderFillableOpts,
 } from '../types';
 import {AbiDecoder} from '../utils/abi_decoder';
 import {assert} from '../utils/assert';
-- 
cgit v1.2.3