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} - 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() - }) - }) + } }, }