From 2019c02fc0fc33d4bd98416654370250d7aa0ca6 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 11 Jan 2017 19:26:56 -0800
Subject: test - fix tests from obs-store

---
 test/lib/mock-config-manager.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'test/lib')

diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js
index b79f63090..0e84aa001 100644
--- a/test/lib/mock-config-manager.js
+++ b/test/lib/mock-config-manager.js
@@ -1,9 +1,12 @@
-var ConfigManager = require('../../app/scripts/lib/config-manager')
+const ConfigManager = require('../../app/scripts/lib/config-manager')
+const ObservableStore = require('../../app/scripts/lib/observable/')
 const STORAGE_KEY = 'metamask-config'
 const extend = require('xtend')
 
 module.exports = function() {
-  return new ConfigManager({ loadData, setData })
+  let store = new ObservableStore(loadData())
+  store.subscribe(setData)
+  return new ConfigManager({ store })
 }
 
 function loadData () {
-- 
cgit 


From 3bc996878b467e1fa5fd63656bd465377daa137d Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Wed, 11 Jan 2017 22:47:56 -0800
Subject: background - move pojo migrator to outside of metamask controller

---
 test/lib/mock-config-manager.js | 64 +++++------------------------------------
 1 file changed, 7 insertions(+), 57 deletions(-)

(limited to 'test/lib')

diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js
index 0e84aa001..c62d91da9 100644
--- a/test/lib/mock-config-manager.js
+++ b/test/lib/mock-config-manager.js
@@ -1,61 +1,11 @@
 const ConfigManager = require('../../app/scripts/lib/config-manager')
-const ObservableStore = require('../../app/scripts/lib/observable/')
+const LocalStorageStore = require('../../app/scripts/lib/observable/local-storage')
+const firstTimeState = require('../../app/scripts/first-time-state')
 const STORAGE_KEY = 'metamask-config'
-const extend = require('xtend')
 
 module.exports = function() {
-  let store = new ObservableStore(loadData())
-  store.subscribe(setData)
-  return new ConfigManager({ store })
-}
-
-function loadData () {
-  var oldData = getOldStyleData()
-  var newData
-
-  try {
-    newData = JSON.parse(window.localStorage[STORAGE_KEY])
-  } catch (e) {}
-
-  var data = extend({
-    meta: {
-      version: 0,
-    },
-    data: {
-      config: {
-        provider: {
-          type: 'testnet',
-        },
-      },
-    },
-  }, oldData || null, newData || null)
-  return data
-}
-
-function getOldStyleData () {
-  var config, wallet, seedWords
-
-  var result = {
-    meta: { version: 0 },
-    data: {},
-  }
-
-  try {
-    config = JSON.parse(window.localStorage['config'])
-    result.data.config = config
-  } catch (e) {}
-  try {
-    wallet = JSON.parse(window.localStorage['lightwallet'])
-    result.data.wallet = wallet
-  } catch (e) {}
-  try {
-    seedWords = window.localStorage['seedWords']
-    result.data.seedWords = seedWords
-  } catch (e) {}
-
-  return result
-}
-
-function setData (data) {
-  window.localStorage[STORAGE_KEY] = JSON.stringify(data)
-}
+  let dataStore = new LocalStorageStore({ storageKey: STORAGE_KEY })
+  // initial state for first time users
+  if (!dataStore.get()) dataStore.put(firstTimeState)
+  return new ConfigManager({ store: dataStore })
+}
\ No newline at end of file
-- 
cgit 


From 76ce348a04b83693eda0e8a40f9888c1f5fe7ef5 Mon Sep 17 00:00:00 2001
From: kumavis <aaron@kumavis.me>
Date: Tue, 24 Jan 2017 19:47:00 -0800
Subject: obs-store - use published module

---
 test/lib/mock-config-manager.js | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'test/lib')

diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js
index c62d91da9..72be86ed1 100644
--- a/test/lib/mock-config-manager.js
+++ b/test/lib/mock-config-manager.js
@@ -1,11 +1,10 @@
+const ObservableStore = require('obs-store')
+const clone = require('clone')
 const ConfigManager = require('../../app/scripts/lib/config-manager')
-const LocalStorageStore = require('../../app/scripts/lib/observable/local-storage')
 const firstTimeState = require('../../app/scripts/first-time-state')
 const STORAGE_KEY = 'metamask-config'
 
 module.exports = function() {
-  let dataStore = new LocalStorageStore({ storageKey: STORAGE_KEY })
-  // initial state for first time users
-  if (!dataStore.get()) dataStore.put(firstTimeState)
-  return new ConfigManager({ store: dataStore })
+  let store = new ObservableStore(clone(firstTimeState))
+  return new ConfigManager({ store })
 }
\ No newline at end of file
-- 
cgit