From e43529107424363f2e6e8a1482fb1c44003f7f6d Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Wed, 29 Jul 2020 19:50:38 -0230
Subject: [PATCH] Use async/await for seedPhraseVerifier.verifyAccounts (#9100)

---
 app/scripts/lib/seed-phrase-verifier.js | 60 +++++++++++--------------
 1 file changed, 26 insertions(+), 34 deletions(-)

diff --git a/app/scripts/lib/seed-phrase-verifier.js b/app/scripts/lib/seed-phrase-verifier.js
index 6a2925c71..f07e63a2c 100644
--- a/app/scripts/lib/seed-phrase-verifier.js
+++ b/app/scripts/lib/seed-phrase-verifier.js
@@ -16,41 +16,33 @@ const seedPhraseVerifier = {
    * @returns {Promise<void>} - Promises undefined
    *
   */
-  verifyAccounts (createdAccounts, seedWords) {
-
-    return new Promise((resolve, reject) => {
-
-      if (!createdAccounts || createdAccounts.length < 1) {
-        return reject(new Error('No created accounts defined.'))
-      }
-
-      const keyringController = new KeyringController({})
-      const Keyring = keyringController.getKeyringClassForType('HD Key Tree')
-      const opts = {
-        mnemonic: seedWords,
-        numberOfAccounts: createdAccounts.length,
+  async verifyAccounts (createdAccounts, seedWords) {
+    if (!createdAccounts || createdAccounts.length < 1) {
+      throw new Error('No created accounts defined.')
+    }
+
+    const keyringController = new KeyringController({})
+    const Keyring = keyringController.getKeyringClassForType('HD Key Tree')
+    const opts = {
+      mnemonic: seedWords,
+      numberOfAccounts: createdAccounts.length,
+    }
+
+    const keyring = new Keyring(opts)
+    const restoredAccounts = await keyring.getAccounts()
+    log.debug('Created accounts: ' + JSON.stringify(createdAccounts))
+    log.debug('Restored accounts: ' + JSON.stringify(restoredAccounts))
+
+    if (restoredAccounts.length !== createdAccounts.length) {
+      // this should not happen...
+      throw new Error('Wrong number of accounts')
+    }
+
+    for (let i = 0; i < restoredAccounts.length; i++) {
+      if (restoredAccounts[i].toLowerCase() !== createdAccounts[i].toLowerCase()) {
+        throw new Error('Not identical accounts! Original: ' + createdAccounts[i] + ', Restored: ' + restoredAccounts[i])
       }
-
-      const keyring = new Keyring(opts)
-      keyring.getAccounts()
-        .then((restoredAccounts) => {
-
-          log.debug('Created accounts: ' + JSON.stringify(createdAccounts))
-          log.debug('Restored accounts: ' + JSON.stringify(restoredAccounts))
-
-          if (restoredAccounts.length !== createdAccounts.length) {
-            // this should not happen...
-            return reject(new Error('Wrong number of accounts'))
-          }
-
-          for (let i = 0; i < restoredAccounts.length; i++) {
-            if (restoredAccounts[i].toLowerCase() !== createdAccounts[i].toLowerCase()) {
-              return reject(new Error('Not identical accounts! Original: ' + createdAccounts[i] + ', Restored: ' + restoredAccounts[i]))
-            }
-          }
-          return resolve()
-        })
-    })
+    }
   },
 }