m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-11-29 07:16:36 +01:00
Code

Clean up "JSON File" import strategy test output (#7855)

Browse Source
This commit is contained in:
Whymarrh Whitby 2020-01-17 19:59:47 -03:30 committed by GitHub
parent 7b35ea6400
commit 3448f34905
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/scripts/account-import-strategies/index.js
View File

@ -1,3 +1,4 @@
import log from 'loglevel'
import Wallet from 'ethereumjs-wallet'
import importers from 'ethereumjs-wallet/thirdparty'
import ethUtil from 'ethereumjs-util'
@ -35,10 +36,7 @@ const accountImporter = {
try {
wallet = importers.fromEtherWallet(input, password)
} catch (e) {
console.log('Attempt to import as EtherWallet format failed, trying V3...')
}
if (!wallet) {
log.debug('Attempt to import as EtherWallet format failed, trying V3')
wallet = Wallet.fromV3(input, password, true)
}