m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-10-22 19:26:13 +02: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 GitHub
parent d990de4a0c
commit e0cc84bbfa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,34 +1,30 @@
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]) { throw new Error(`Missing identity for address ${secondAddress}`)
throw new Error(`Missing identity for address ${secondAddress}`) } else if (identities[firstAddress].lastSelected === identities[secondAddress].lastSelected) {
} else if (identities[firstAddress].lastSelected === identities[secondAddress].lastSelected) { return 0
return 0 } else if (identities[firstAddress].lastSelected === undefined) {
} else if (identities[firstAddress].lastSelected === undefined) { return 1
return 1 } else if (identities[secondAddress].lastSelected === undefined) {
} else if (identities[secondAddress].lastSelected === undefined) { return -1
return -1 }
}
return identities[secondAddress].lastSelected - identities[firstAddress].lastSelected return identities[secondAddress].lastSelected - identities[firstAddress].lastSelected
})
end()
}) })
.catch( end()
(err) => { } catch (err) {
res.error = err res.error = err
end(err) end(err)
}, }
)
}, },
}, },
} }