m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

Promisify persistence of keyrings before returning key

Browse Source 
Change single letter variables (shame)
This commit is contained in:
Kevin Serrano 2016-11-18 15:58:49 -08:00
parent c695d54b01
commit bc6312e9e3
No known key found for this signature in database
GPG Key ID: 7CC862A58D2889B4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/scripts/keyring-controller.js
View File

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