m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-27 04:46:10 +01:00
Code

Fix messy merge

Browse Source
This commit is contained in:
Frankie 2017-02-01 13:25:36 -08:00
parent 54b1339f6a
commit a96f892788
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,6 @@ class KeyringController extends EventEmitter {
this.ethStore = opts.ethStore this.ethStore = opts.ethStore
this.encryptor = encryptor this.encryptor = encryptor
this.keyrings = [] this.keyrings = []
this.identities = {} // Essentially a name hash
this.getNetwork = opts.getNetwork this.getNetwork = opts.getNetwork
} }
@ -144,17 +143,6 @@ class KeyringController extends EventEmitter {
.then(this.fullUpdate.bind(this)) .then(this.fullUpdate.bind(this))
} }
// ClearSeedWordCache
//
// returns Promise( @string currentSelectedAccount )
//
// Removes the current vault's seed words from the UI's state tree,
// ensuring they are only ever available in the background process.
clearSeedWordCache () {
this.configManager.setSeedWords(null)
return Promise.resolve(this.configManager.getSelectedAccount())
}
// Set Locked // Set Locked
// returns Promise( @object state ) // returns Promise( @object state )
// //
@ -206,8 +194,8 @@ class KeyringController extends EventEmitter {
this.keyrings.push(keyring) this.keyrings.push(keyring)
return this.setupAccounts(accounts) return this.setupAccounts(accounts)
}) })
.then(() => { return this.password }) .then(() => this.persistAllKeyrings())
.then(this.persistAllKeyrings.bind(this)) .then(() => this.fullUpdate())
.then(() => { .then(() => {
return keyring return keyring
}) })