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

Merge pull request #899 from MetaMask/i893-DenodeifyKeyringController

Browse Source 
Fix incorrect nodeification and add descriptive error to help find in future
This commit is contained in:
Kevin Serrano 2016-11-29 15:59:18 -08:00 committed by GitHub
commit 5af4157363
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -282,7 +282,7 @@ module.exports = class KeyringController extends EventEmitter {
setSelectedAccount (address) { setSelectedAccount (address) {
var addr = normalize(address) var addr = normalize(address)
this.configManager.setSelectedAccount(addr) this.configManager.setSelectedAccount(addr)
Promise.resolve(addr) return Promise.resolve(addr)
} }
// Save Account Label // Save Account Label

11
app/scripts/lib/nodeify.js
View File

@ -6,12 +6,19 @@ module.exports = function (promiseFn) {
} }
var cb = arguments[arguments.length - 1] var cb = arguments[arguments.length - 1]
return promiseFn.apply(this, args) const nodeified = promiseFn.apply(this, args)
.then(function (result) {
if (!nodeified) {
const methodName = String(promiseFn).split('(')[0]
throw new Error(`The ${methodName} did not return a Promise, but was nodeified.`)
}
nodeified.then(function (result) {
cb(null, result) cb(null, result)
}) })
.catch(function (reason) { .catch(function (reason) {
cb(reason) cb(reason)
}) })
return nodeified
} }
} }