Fix dual vault creation bug

2 files changed, 16 insertions, 12 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index f0fb0ad65..3b59c7890 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -131,12 +131,10 @@ module.exports = class KeyringController extends EventEmitter {
         const keyring = this.restoreKeyring(accountLength, serialized)
         this.keyrings.push(keyring)
         this.configManager.setSelectedAccount(keyring.getAccounts()[0])
-        return this.persistAllKeyrings().then(() => {
-          return key
-        })
-      } else {
-        return Promise.resolve(key)
       }
+      return this.persistAllKeyrings().then(() => {
+        return key
+      })
     })
   }
 
@@ -147,12 +145,7 @@ module.exports = class KeyringController extends EventEmitter {
 
     return this.migrateAndGetKey(password)
     .then((key) => {
-      return new Promise((res, rej) => {
-        this.createFirstKeyTree(password, (err, state) => {
-          if (err) return rej(err)
-          res(configManager.getVault())
-        })
-      })
+      cb(null, configManager.getVault())
     })
     .then((encryptedString) => {
       const serialized = this.keyrings[0].serialize()
diff --git a/test/unit/keyrings/hd-test.js b/test/unit/keyrings/hd-test.js
index a2284995a..5d7fbe3db 100644
--- a/test/unit/keyrings/hd-test.js
+++ b/test/unit/keyrings/hd-test.js
@@ -9,13 +9,24 @@ const sampleMnemonic = 'finish oppose decorate face calm tragic certain desk hou
 const firstAcct = '1c96099350f13d558464ec79b9be4445aa0ef579'
 const secondAcct = '1b00aed43a693f3a957f9feb5cc08afa031e37a0'
 
-describe('simple-keyring', function() {
+describe('hd-keyring', function() {
 
   let keyring
   beforeEach(function() {
     keyring = new HdKeyring()
   })
 
+  describe('constructor', function() {
+    keyring = new HdKeyring({
+      mnemonic: sampleMnemonic,
+      n: 2,
+    })
+
+    const accounts = keyring.getAccounts()
+    assert.equal(accounts[0], firstAcct)
+    assert.equal(accounts[1], secondAcct)
+  })
+
   describe('Keyring.type()', function() {
     it('is a class method that returns the type string.', function() {
       const type = HdKeyring.type()