Merge pull request #4279 from MetaMask/network-remove-provider-engine

Enhancement: New BlockTracker and Json-Rpc-Engine based Provider

1 files changed, 33 insertions, 20 deletions

diff --git a/test/unit/app/controllers/detect-tokens-test.js b/test/unit/app/controllers/detect-tokens-test.js
index d6c3fad8a..e5539256e 100644
--- a/test/unit/app/controllers/detect-tokens-test.js
+++ b/test/unit/app/controllers/detect-tokens-test.js
@@ -1,4 +1,5 @@
 const assert = require('assert')
+const nock = require('nock')
 const sinon = require('sinon')
 const ObservableStore = require('obs-store')
 const DetectTokensController = require('../../../../app/scripts/controllers/detect-tokens')
@@ -6,15 +7,34 @@ const NetworkController = require('../../../../app/scripts/controllers/network/n
 const PreferencesController = require('../../../../app/scripts/controllers/preferences')
 
 describe('DetectTokensController', () => {
-    const sandbox = sinon.createSandbox()
-    let clock, keyringMemStore, network, preferences
-    beforeEach(async () => {
-      keyringMemStore = new ObservableStore({ isUnlocked: false})
-      network = new NetworkController({ provider: { type: 'mainnet' }})
-      preferences = new PreferencesController({ network })
-    })
-      after(() => {
-        sandbox.restore()
+  const sandbox = sinon.createSandbox()
+  let clock, keyringMemStore, network, preferences, controller
+
+  const noop = () => {}
+
+  const networkControllerProviderConfig = {
+    getAccounts: noop,
+  }
+
+  beforeEach(async () => {
+
+
+    nock('https://api.infura.io')
+      .get(/.*/)
+      .reply(200)
+
+    keyringMemStore = new ObservableStore({ isUnlocked: false})
+    network = new NetworkController()
+    preferences = new PreferencesController({ network })
+    controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
+
+    network.initializeProvider(networkControllerProviderConfig)
+
+  })
+
+  after(() => {
+    sandbox.restore()
+    nock.cleanAll()
   })
 
   it('should poll on correct interval', async () => {
@@ -26,7 +46,10 @@ describe('DetectTokensController', () => {
 
   it('should be called on every polling period', async () => {
     clock = sandbox.useFakeTimers()
+    const network = new NetworkController()
+    network.initializeProvider(networkControllerProviderConfig)
     network.setProviderType('mainnet')
+    const preferences = new PreferencesController({ network })
     const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
     controller.isOpen = true
     controller.isUnlocked = true
@@ -44,8 +67,6 @@ describe('DetectTokensController', () => {
   })
 
   it('should not check tokens while in test network', async () => {
-    network.setProviderType('rinkeby')
-    const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
     controller.isOpen = true
     controller.isUnlocked = true
 
@@ -58,7 +79,6 @@ describe('DetectTokensController', () => {
   })
 
   it('should only check and add tokens while in main network', async () => {
-    network.setProviderType('mainnet')
     const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
     controller.isOpen = true
     controller.isUnlocked = true
@@ -75,7 +95,6 @@ describe('DetectTokensController', () => {
   })
 
   it('should not detect same token while in main network', async () => {
-    network.setProviderType('mainnet')
     preferences.addToken('0x0d262e5dc4a06a0f1c90ce79c7a60c09dfc884e4', 'J8T', 8)
     const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
     controller.isOpen = true
@@ -93,8 +112,6 @@ describe('DetectTokensController', () => {
   })
 
   it('should trigger detect new tokens when change address', async () => {
-    network.setProviderType('mainnet')
-    const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
     controller.isOpen = true
     controller.isUnlocked = true
     var stub = sandbox.stub(controller, 'detectNewTokens')
@@ -103,8 +120,6 @@ describe('DetectTokensController', () => {
   })
 
   it('should trigger detect new tokens when submit password', async () => {
-    network.setProviderType('mainnet')
-    const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
     controller.isOpen = true
     controller.selectedAddress = '0x0'
     var stub = sandbox.stub(controller, 'detectNewTokens')
@@ -113,8 +128,6 @@ describe('DetectTokensController', () => {
   })
 
   it('should not trigger detect new tokens when not open or not unlocked', async () => {
-    network.setProviderType('mainnet')
-    const controller = new DetectTokensController({ preferences: preferences, network: network, keyringMemStore: keyringMemStore })
     controller.isOpen = true
     controller.isUnlocked = false
     var stub = sandbox.stub(controller, 'detectTokenBalance')
@@ -125,4 +138,4 @@ describe('DetectTokensController', () => {
     clock.tick(180000)
     sandbox.assert.notCalled(stub)
   })
-})
+})
\ No newline at end of file