diff options
author | Bruno <brunobar79@gmail.com> | 2018-06-13 14:01:47 +0800 |
---|---|---|
committer | Bruno <brunobar79@gmail.com> | 2018-06-13 14:01:47 +0800 |
commit | bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6 (patch) | |
tree | dd619a266cd91222ba19b0af0c47598d82483d89 /app/scripts/metamask-controller.js | |
parent | fe3d81cfd828be06ffdebc2ed348a01ee235062c (diff) | |
parent | b6980eed87dcd3b3fcd8a901af0cf075d894d956 (diff) | |
download | tangerine-wallet-browser-bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6.tar.gz tangerine-wallet-browser-bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6.tar.zst tangerine-wallet-browser-bb4cc72646def9b32fffb8e6a208a2cae9d4f8c6.zip |
fix merge conflicts
Diffstat (limited to 'app/scripts/metamask-controller.js')
-rw-r--r-- | app/scripts/metamask-controller.js | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index abe7ff8a2..6c380fd71 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -443,28 +443,24 @@ module.exports = class MetamaskController extends EventEmitter { * @returns {Object} vault */ async createNewVaultAndKeychain (password) { - const release = await this.createVaultMutex.acquire() - let vault - + const releaseLock = await this.createVaultMutex.acquire() try { + let vault const accounts = await this.keyringController.getAccounts() - if (accounts.length > 0) { vault = await this.keyringController.fullUpdate() - } else { vault = await this.keyringController.createNewVaultAndKeychain(password) const accounts = await this.keyringController.getAccounts() this.preferencesController.setAddresses(accounts) this.selectFirstIdentity() } - release() + releaseLock() + return vault } catch (err) { - release() + releaseLock() throw err } - - return vault } /** @@ -473,7 +469,7 @@ module.exports = class MetamaskController extends EventEmitter { * @param {} seed */ async createNewVaultAndRestore (password, seed) { - const release = await this.createVaultMutex.acquire() + const releaseLock = await this.createVaultMutex.acquire() try { // clear known identities this.preferencesController.setAddresses([]) @@ -483,10 +479,10 @@ module.exports = class MetamaskController extends EventEmitter { const accounts = await this.keyringController.getAccounts() this.preferencesController.setAddresses(accounts) this.selectFirstIdentity() - release() + releaseLock() return vault } catch (err) { - release() + releaseLock() throw err } } |