Merge pull request #1487 from MetaMask/stopPolling

Stop polling

2 files changed, 6 insertions, 2 deletions

diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 4fdd92921..c07f13b8d 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -53,6 +53,7 @@ module.exports = class NetworkController extends EventEmitter {
     this.providerInit = newInit
 
     this._provider.removeAllListeners()
+    this._provider.stop()
     this.provider = MetaMaskProvider(newInit)
     // apply the listners created by other controllers
     Object.keys(this._providerListeners).forEach((key) => {
diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js
index 183e69cab..76452b303 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/network-contoller-test.js
@@ -1,4 +1,3 @@
-const EventEmitter = require('events')
 const assert = require('assert')
 const NetworkController = require('../../app/scripts/controllers/network')
 
@@ -12,7 +11,11 @@ describe('# Network Controller', function () {
       },
     })
     // stub out provider
-    networkController._provider = new EventEmitter()
+    networkController._provider = new Proxy({}, {
+      get: (obj, name) => {
+        return () => {}
+      },
+    })
     networkController.providerInit = {
       getAccounts: () => {},
     }