fix up

Author: adonesky1

index.js

@@ -112,41 +112,32 @@ class KeyringController extends EventEmitter {
    * either as a string or Uint8Array.
    * @returns {Promise<object>} A Promise that resolves to the state.
    */
-  createNewVaultAndRestore(password, seedPhrase) {
+  async createNewVaultAndRestore(password, seedPhrase) {
     const encodedSeedPhrase = this._mnemonicToUint8Array(seedPhrase);
 
     if (typeof password !== 'string') {
       throw new Error('Password must be text.');
     }
 
     if (!bip39.validateMnemonic(encodedSeedPhrase, wordlist)) {
-      return Promise.reject(
-        new Error('KeyringController - Seed phrase is invalid.'),
-      );
+      throw new Error('KeyringController - Seed phrase is invalid.');
     }
 
     this.password = password;
 
-    this.clearKeyrings();
-    return this.persistAllKeyrings(password)
-      .then(() => {
-        return this.addNewKeyring(KEYRINGS_TYPE_MAP.HD_KEYRING, {
-          mnemonic: encodedSeedPhrase,
-          numberOfAccounts: 1,
-        });
-      })
-      .then((firstKeyring) => {
-        return firstKeyring.getAccounts();
-      })
-      .then(([firstAccount]) => {
-        if (!firstAccount) {
-          throw new Error('KeyringController - First Account not found.');
-        }
-        return null;
-      })
-      .then(this.persistAllKeyrings.bind(this, password))
-      .then(this.setUnlocked.bind(this))
-      .then(this.fullUpdate.bind(this));
+    await this.clearKeyrings();
+    await this.persistAllKeyrings(password);
+    const keyring = await this.addNewKeyring(KEYRINGS_TYPE_MAP.HD_KEYRING, {
+      mnemonic: encodedSeedPhrase,
+      numberOfAccounts: 1,
+    });
+    const [firstAccount] = await keyring.getAccounts();
+
+    if (!firstAccount) {
+      throw new Error('KeyringController - First Account not found.');
+    }
+    this.setUnlocked();
+    return this.fullUpdate();
   }
 
   /**

test/index.js

@@ -180,7 +180,7 @@ describe('KeyringController', function () {
     it('throws error if argument password is not a string', async function () {
       await expect(() =>
         keyringController.createNewVaultAndRestore(12, walletTwoSeedWords),
-      ).toThrow('Password must be text.');
+      ).rejects.toThrow('Password must be text.');
     });
 
     it('throws error if mnemonic passed is invalid', async function () {