Delete ConfigManager, replacing its usages with PreferencesController

5 files changed, 46 insertions, 146 deletions

diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js
deleted file mode 100644
index 0cc6953bb..000000000
--- a/test/lib/mock-config-manager.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const ObservableStore = require('obs-store')
-const clone = require('clone')
-const ConfigManager = require('../../app/scripts/lib/config-manager')
-const firstTimeState = require('../../app/scripts/first-time-state')
-
-module.exports = function () {
-  const store = new ObservableStore(clone(firstTimeState))
-  return new ConfigManager({ store })
-}
diff --git a/test/unit/app/controllers/metamask-controller-test.js b/test/unit/app/controllers/metamask-controller-test.js
index 85c78fe1e..e7a28bedb 100644
--- a/test/unit/app/controllers/metamask-controller-test.js
+++ b/test/unit/app/controllers/metamask-controller-test.js
@@ -584,22 +584,18 @@ describe('MetaMaskController', function () {
   })
 
   describe('#clearSeedWordCache', function () {
+    it('should set seed words to null', function (done) {
+      sandbox.stub(metamaskController.preferencesController, 'setSeedWords')
+      metamaskController.clearSeedWordCache((err) => {
+        if (err) {
+          done(err)
+        }
 
-    it('should have set seed words', function () {
-      metamaskController.configManager.setSeedWords('test words')
-      const getConfigSeed = metamaskController.configManager.getSeedWords()
-      assert.equal(getConfigSeed, 'test words')
-    })
-
-    it('should clear config seed phrase', function () {
-      metamaskController.configManager.setSeedWords('test words')
-      metamaskController.clearSeedWordCache((err, result) => {
-        if (err) console.log(err)
+        assert.ok(metamaskController.preferencesController.setSeedWords.calledOnce)
+        assert.deepEqual(metamaskController.preferencesController.setSeedWords.args, [[null]])
+        done()
       })
-      const getConfigSeed = metamaskController.configManager.getSeedWords()
-      assert.equal(getConfigSeed, null)
     })
-
   })
 
   describe('#setCurrentLocale', function () {
@@ -793,24 +789,24 @@ describe('MetaMaskController', function () {
   describe('#markAccountsFound', function () {
     it('adds lost accounts to config manager data', function () {
       metamaskController.markAccountsFound(noop)
-      const configManagerData = metamaskController.configManager.getData()
-      assert.deepEqual(configManagerData.lostAccounts, [])
+      const state = metamaskController.getState()
+      assert.deepEqual(state.lostAccounts, [])
     })
   })
 
   describe('#markPasswordForgotten', function () {
     it('adds and sets forgottenPassword to config data to true', function () {
       metamaskController.markPasswordForgotten(noop)
-      const configManagerData = metamaskController.configManager.getData()
-      assert.equal(configManagerData.forgottenPassword, true)
+      const state = metamaskController.getState()
+      assert.equal(state.forgottenPassword, true)
     })
   })
 
   describe('#unMarkPasswordForgotten', function () {
     it('adds and sets forgottenPassword to config data to false', function () {
       metamaskController.unMarkPasswordForgotten(noop)
-      const configManagerData = metamaskController.configManager.getData()
-      assert.equal(configManagerData.forgottenPassword, false)
+      const state = metamaskController.getState()
+      assert.equal(state.forgottenPassword, false)
     })
   })
 
diff --git a/test/unit/app/controllers/notice-controller-test.js b/test/unit/app/controllers/notice-controller-test.js
index b3ae75080..5e6ae9ac5 100644
--- a/test/unit/app/controllers/notice-controller-test.js
+++ b/test/unit/app/controllers/notice-controller-test.js
@@ -1,16 +1,11 @@
 const assert = require('assert')
-const configManagerGen = require('../../../lib/mock-config-manager')
 const NoticeController = require('../../../../app/scripts/notice-controller')
 
 describe('notice-controller', function () {
   var noticeController
 
   beforeEach(function () {
-    // simple localStorage polyfill
-    const configManager = configManagerGen()
-    noticeController = new NoticeController({
-      configManager: configManager,
-    })
+    noticeController = new NoticeController({})
   })
 
   describe('notices', function () {
diff --git a/test/unit/app/controllers/preferences-controller-test.js b/test/unit/app/controllers/preferences-controller-test.js
index 2c261be90..b5ccf3fb5 100644
--- a/test/unit/app/controllers/preferences-controller-test.js
+++ b/test/unit/app/controllers/preferences-controller-test.js
@@ -449,5 +449,35 @@ describe('preferences controller', function () {
       assert.ok(assetImages[address], `set image correctly`)
     })
   })
+
+  describe('setPasswordForgotten', function () {
+    it('should default to false', function () {
+      const state = preferencesController.store.getState()
+      assert.equal(state.forgottenPassword, false)
+    })
+
+    it('should set the forgottenPassword property in state', function () {
+      assert.equal(preferencesController.store.getState().forgottenPassword, false)
+
+      preferencesController.setPasswordForgotten(true)
+
+      assert.equal(preferencesController.store.getState().forgottenPassword, true)
+    })
+  })
+
+  describe('setSeedWords', function () {
+    it('should default to null', function () {
+      const state = preferencesController.store.getState()
+      assert.equal(state.seedWords, null)
+    })
+
+    it('should set the seedWords property in state', function () {
+      assert.equal(preferencesController.store.getState().seedWords, null)
+
+      preferencesController.setSeedWords('foo bar baz')
+
+      assert.equal(preferencesController.store.getState().seedWords, 'foo bar baz')
+    })
+  })
 })
 
diff --git a/test/unit/config-manager-test.js b/test/unit/config-manager-test.js
deleted file mode 100644
index df0c549d0..000000000
--- a/test/unit/config-manager-test.js
+++ /dev/null
@@ -1,112 +0,0 @@
-const assert = require('assert')
-const configManagerGen = require('../lib/mock-config-manager')
-
-describe('config-manager', function () {
-  var configManager
-
-  beforeEach(function () {
-    configManager = configManagerGen()
-  })
-
-  describe('#setConfig', function () {
-    it('should set the config key', function () {
-      var testConfig = {
-        provider: {
-          type: 'rpc',
-          rpcTarget: 'foobar',
-        },
-      }
-      configManager.setConfig(testConfig)
-      var result = configManager.getData()
-
-      assert.equal(result.config.provider.type, testConfig.provider.type)
-      assert.equal(result.config.provider.rpcTarget, testConfig.provider.rpcTarget)
-    })
-
-    it('setting wallet should not overwrite config', function () {
-      var testConfig = {
-        provider: {
-          type: 'rpc',
-          rpcTarget: 'foobar',
-        },
-      }
-      configManager.setConfig(testConfig)
-
-      var testWallet = {
-        name: 'this is my fake wallet',
-      }
-      configManager.setWallet(testWallet)
-
-      var result = configManager.getData()
-      assert.equal(result.wallet.name, testWallet.name, 'wallet name is set')
-      assert.equal(result.config.provider.rpcTarget, testConfig.provider.rpcTarget)
-
-      testConfig.provider.type = 'something else!'
-      configManager.setConfig(testConfig)
-
-      result = configManager.getData()
-      assert.equal(result.wallet.name, testWallet.name, 'wallet name is set')
-      assert.equal(result.config.provider.rpcTarget, testConfig.provider.rpcTarget)
-      assert.equal(result.config.provider.type, testConfig.provider.type)
-    })
-  })
-
-  describe('wallet nicknames', function () {
-    it('should return null when no nicknames are saved', function () {
-      var nick = configManager.nicknameForWallet('0x0')
-      assert.equal(nick, null, 'no nickname returned')
-    })
-
-    it('should persist nicknames', function () {
-      var account = '0x0'
-      var nick1 = 'foo'
-      var nick2 = 'bar'
-      configManager.setNicknameForWallet(account, nick1)
-
-      var result1 = configManager.nicknameForWallet(account)
-      assert.equal(result1, nick1)
-
-      configManager.setNicknameForWallet(account, nick2)
-      var result2 = configManager.nicknameForWallet(account)
-      assert.equal(result2, nick2)
-    })
-  })
-
-  describe('rpc manipulations', function () {
-    it('changing rpc should return a different rpc', function () {
-      var firstRpc = 'first'
-      var secondRpc = 'second'
-
-      configManager.setRpcTarget(firstRpc)
-      var firstResult = configManager.getCurrentRpcAddress()
-      assert.equal(firstResult, firstRpc)
-
-      configManager.setRpcTarget(secondRpc)
-      var secondResult = configManager.getCurrentRpcAddress()
-      assert.equal(secondResult, secondRpc)
-    })
-  })
-
-  describe('transactions', function () {
-    beforeEach(function () {
-      configManager.setTxList([])
-    })
-
-    describe('#getTxList', function () {
-      it('when new should return empty array', function () {
-        var result = configManager.getTxList()
-        assert.ok(Array.isArray(result))
-        assert.equal(result.length, 0)
-      })
-    })
-
-    describe('#setTxList', function () {
-      it('saves the submitted data to the tx list', function () {
-        var target = [{ foo: 'bar' }]
-        configManager.setTxList(target)
-        var result = configManager.getTxList()
-        assert.equal(result[0].foo, 'bar')
-      })
-    })
-  })
-})