Resolve merge conflict.

3 files changed, 71 insertions, 1 deletions

diff --git a/test/lib/mock-config-manager.js b/test/lib/mock-config-manager.js
index fe841f455..ccd518c68 100644
--- a/test/lib/mock-config-manager.js
+++ b/test/lib/mock-config-manager.js
@@ -1,5 +1,5 @@
 var ConfigManager = require('../../app/scripts/lib/config-manager')
-const STORAGE_KEY = 'metamask-persistance-key'
+const STORAGE_KEY = 'metamask-config'
 const extend = require('xtend')
 
 module.exports = function() {
diff --git a/test/lib/mock-encryptor.js b/test/lib/mock-encryptor.js
new file mode 100644
index 000000000..09bbf7ad5
--- /dev/null
+++ b/test/lib/mock-encryptor.js
@@ -0,0 +1,32 @@
+var mockHex = '0xabcdef0123456789'
+var mockKey = new Buffer(32)
+let cacheVal
+
+module.exports = {
+
+  encrypt(password, dataObj) {
+    cacheVal = dataObj
+    return Promise.resolve(mockHex)
+  },
+
+  decrypt(password, text) {
+    return Promise.resolve(cacheVal || {})
+  },
+
+  encryptWithKey(key, dataObj) {
+    return this.encrypt(key, dataObj)
+  },
+
+  decryptWithKey(key, text) {
+    return this.decrypt(key, text)
+  },
+
+  keyFromPassword(password) {
+    return Promise.resolve(mockKey)
+  },
+
+  generateSalt() {
+    return 'WHADDASALT!'
+  },
+
+}
diff --git a/test/lib/mock-simple-keychain.js b/test/lib/mock-simple-keychain.js
new file mode 100644
index 000000000..615b3e537
--- /dev/null
+++ b/test/lib/mock-simple-keychain.js
@@ -0,0 +1,38 @@
+var fakeWallet = {
+  privKey: '0x123456788890abcdef',
+  address: '0xfedcba0987654321',
+}
+const type = 'Simple Key Pair'
+
+module.exports = class MockSimpleKeychain {
+
+  static type() { return type }
+
+  constructor(opts) {
+    this.type = type
+    this.opts = opts || {}
+    this.wallets = []
+  }
+
+  serialize() {
+    return [ fakeWallet.privKey ]
+  }
+
+  deserialize(data) {
+    if (!Array.isArray(data)) {
+      throw new Error('Simple keychain deserialize requires a privKey array.')
+    }
+    this.wallets = [ fakeWallet ]
+  }
+
+  addAccounts(n = 1) {
+    for(var i = 0; i < n; i++) {
+      this.wallets.push(fakeWallet)
+    }
+  }
+
+  getAccounts() {
+    return this.wallets.map(w => w.address)
+  }
+
+}