Move provider altering logic to Web3Wrapper

1 files changed, 11 insertions, 10 deletions

diff --git a/src/mempool/order_watcher.ts b/src/mempool/order_watcher.ts
index 90c15cd34..b2c8598e7 100644
--- a/src/mempool/order_watcher.ts
+++ b/src/mempool/order_watcher.ts
@@ -1,22 +1,23 @@
-import * as Web3 from 'web3';
 import * as _ from 'lodash';
-import {Web3Provider, SignedOrder} from '../types';
+import {ZeroEx} from '../';
+import {assert} from '../utils/assert';
+import {Web3Provider, SignedOrder, OnOrderFillabilityStateChangeCallback} from '../types';
 import {Web3Wrapper} from '../web3_wrapper';
 
 export class OrderWatcher {
+    private _orders = new Map<string, SignedOrder>();
+    private _web3Wrapper: Web3Wrapper;
     constructor(provider: Web3Provider) {
-        if (_.isUndefined((provider as any).sendAsync)) {
-            // Web3@1.0 provider doesn't support synchronous http requests,
-            // so it only has an async `send` method, instead of a `send` and `sendAsync` in web3@0.x.x`
-            // We re-assign the send method so that Web3@1.0 providers work with 0x.js
-            (provider as any).sendAsync = (provider as any).send;
-        }
+        assert.isWeb3Provider('provider', provider);
+        this._web3Wrapper = new Web3Wrapper(provider);
     }
     public addOrder(signedOrder: SignedOrder): void {
-        //
+        const orderHash = ZeroEx.getOrderHashHex(signedOrder);
+        this._orders.set(orderHash, signedOrder);
     }
     public removeOrder(signedOrder: SignedOrder): void {
-        //
+        const orderHash = ZeroEx.getOrderHashHex(signedOrder);
+        this._orders.delete(orderHash);
     }
     public subscribe(callback: OnOrderFillabilityStateChangeCallback): void {
         //