Promisify persistence of keyrings before returning key

Change single letter variables (shame)
feature/default_network_editable
Kevin Serrano 8 years ago
parent c695d54b01
commit bc6312e9e3
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
  1. 10
      app/scripts/keyring-controller.js

@ -127,8 +127,9 @@ module.exports = class KeyringController extends EventEmitter {
if (serialized && shouldMigrate) {
const keyring = this.restoreKeyring(serialized)
this.keyrings.push(keyring)
this.persistAllKeyrings()
this.configManager.setSelectedAccount(keyring.getAccounts()[0])
return this.persistAllKeyrings()
.then(() => { return key })
}
return key
})
@ -274,13 +275,12 @@ module.exports = class KeyringController extends EventEmitter {
}
persistAllKeyrings () {
const serialized = this.keyrings.map((k) => {
const serialized = this.keyrings.map((keyring) => {
return {
type: k.type,
data: k.serialize(),
type: keyring.type,
data: keyring.serialize(),
}
})
return this.encryptor.encryptWithKey(this.key, serialized)
.then((encryptedString) => {
this.configManager.setVault(encryptedString)

Loading…
Cancel
Save