Gracefully remove old blockTracker event handlers

MetaMask · Aug 1, 2018 · 580d317 · 580d317
1 parent 7d6af73
commit 580d317
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gaba",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.14",
   "description": "Collection of platform-agnostic modules for creating secure data models for cryptocurrency wallets",
   "license": "MIT",
   "scripts": {

diff --git a/src/NetworkController.ts b/src/NetworkController.ts
@@ -107,18 +107,7 @@ export class NetworkController extends BaseController<NetworkState, NetworkConfi
 	}
 
 	private updateProvider(provider: any) {
-		if (this.provider) {
-			const oldBlockTracker = this.provider._blockTracker;
-			const newBlockTracker = provider._blockTracker;
-			Object.keys(oldBlockTracker._events).forEach((event) => {
-				const listeners = oldBlockTracker.listeners(event);
-				listeners.forEach((listener: EventListener) => {
-					newBlockTracker.on(event, listener);
-					oldBlockTracker.removeListener(event, listener);
-				});
-			});
-			this.provider.stop();
-		}
+		this.provider && this.provider.stop();
 		this.provider = provider;
 	}
 

diff --git a/src/TokenRatesController.ts b/src/TokenRatesController.ts
@@ -1,6 +1,6 @@
 import 'isomorphic-fetch';
 import BaseController, { BaseConfig, BaseState } from './BaseController';
-import { PreferencesController } from './PreferencesController';
+import PreferencesController from './PreferencesController';
 import { safelyExecute } from './util';
 
 /**