Made progress on parity for MultiVault

- Deleted some unused items
- Renamed files and paths to match with new locations.
- Modified keyring controller logic to separate concerns.
- Fix account naming issues.
- Enable creation of new vault with default HD keyring.
- Formatting issues.

1 files changed, 13 insertions, 5 deletions

diff --git a/app/scripts/keyrings/hd.js b/app/scripts/keyrings/hd.js
index 61df8f28e..69b8d25bc 100644
--- a/app/scripts/keyrings/hd.js
+++ b/app/scripts/keyrings/hd.js
@@ -17,13 +17,22 @@ module.exports = class HdKeyring extends EventEmitter {
     super()
     this.type = type
     this.opts = opts || {}
+    this.deserialize(opts)
+  }
+
+  deserialize(opts) {
     this.wallets = []
     this.mnemonic = null
-  }
+    this.root = null
+
+    if ('mnemonic' in opts) {
+      this.initFromMnemonic(opts.mnemonic)
+    }
+
+    if ('n' in opts) {
+      this.addAccounts(opts.n)
+    }
 
-  deserialize({ mnemonic, n }) {
-    this.initFromMnemonic(mnemonic || bip39.generateMnemonic())
-    this.addAccounts(n)
   }
 
   initFromMnemonic(mnemonic) {
@@ -83,4 +92,3 @@ module.exports = class HdKeyring extends EventEmitter {
   }
 
 }
-