Use async/await for seedPhraseVerifier.verifyAccounts (#9100)

feature/default_network_editable
Whymarrh Whitby 4 years ago committed by GitHub
parent e0cc84bbfa
commit 002f021fc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 18
      app/scripts/lib/seed-phrase-verifier.js

@ -16,12 +16,9 @@ const seedPhraseVerifier = {
* @returns {Promise<void>} - Promises undefined * @returns {Promise<void>} - Promises undefined
* *
*/ */
verifyAccounts (createdAccounts, seedWords) { async verifyAccounts (createdAccounts, seedWords) {
return new Promise((resolve, reject) => {
if (!createdAccounts || createdAccounts.length < 1) { if (!createdAccounts || createdAccounts.length < 1) {
return reject(new Error('No created accounts defined.')) throw new Error('No created accounts defined.')
} }
const keyringController = new KeyringController({}) const keyringController = new KeyringController({})
@ -32,25 +29,20 @@ const seedPhraseVerifier = {
} }
const keyring = new Keyring(opts) const keyring = new Keyring(opts)
keyring.getAccounts() const restoredAccounts = await keyring.getAccounts()
.then((restoredAccounts) => {
log.debug('Created accounts: ' + JSON.stringify(createdAccounts)) log.debug('Created accounts: ' + JSON.stringify(createdAccounts))
log.debug('Restored accounts: ' + JSON.stringify(restoredAccounts)) log.debug('Restored accounts: ' + JSON.stringify(restoredAccounts))
if (restoredAccounts.length !== createdAccounts.length) { if (restoredAccounts.length !== createdAccounts.length) {
// this should not happen... // this should not happen...
return reject(new Error('Wrong number of accounts')) throw new Error('Wrong number of accounts')
} }
for (let i = 0; i < restoredAccounts.length; i++) { for (let i = 0; i < restoredAccounts.length; i++) {
if (restoredAccounts[i].toLowerCase() !== createdAccounts[i].toLowerCase()) { if (restoredAccounts[i].toLowerCase() !== createdAccounts[i].toLowerCase()) {
return reject(new Error('Not identical accounts! Original: ' + createdAccounts[i] + ', Restored: ' + restoredAccounts[i])) throw new Error('Not identical accounts! Original: ' + createdAccounts[i] + ', Restored: ' + restoredAccounts[i])
} }
} }
return resolve()
})
})
}, },
} }

Loading…
Cancel
Save