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

Use async/await for getRestrictedMethods (#9099)

Browse Source
This commit is contained in:
Whymarrh Whitby 2020-07-29 19:50:20 -02:30 committed by Mark Stacey
parent 2445c0b41b
commit a7089193c8
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/scripts/controllers/permissions/restrictedMethods.js
View File

@ -1,12 +1,11 @@
export default function getRestrictedMethods ({ getIdentities, getKeyringAccounts }) { export default function getRestrictedMethods ({ getIdentities, getKeyringAccounts }) {
return { return {
'eth_accounts': { 'eth_accounts': {
method: (_, res, __, end) => { method: async (_, res, __, end) => {
getKeyringAccounts() try {
.then((accounts) => { const accounts = await getKeyringAccounts()
const identities = getIdentities() const identities = getIdentities()
res.result = accounts res.result = accounts.sort((firstAddress, secondAddress) => {
.sort((firstAddress, secondAddress) => {
if (!identities[firstAddress]) { if (!identities[firstAddress]) {
throw new Error(`Missing identity for address ${firstAddress}`) throw new Error(`Missing identity for address ${firstAddress}`)
} else if (!identities[secondAddress]) { } else if (!identities[secondAddress]) {
@ -22,13 +21,10 @@ export default function getRestrictedMethods ({ getIdentities, getKeyringAccount
return identities[secondAddress].lastSelected - identities[firstAddress].lastSelected return identities[secondAddress].lastSelected - identities[firstAddress].lastSelected
}) })
end() end()
}) } catch (err) {
.catch(
(err) => {
res.error = err res.error = err
end(err) end(err)
}, }
)
}, },
}, },
} }