aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts/migrations
diff options
context:
space:
mode:
authorkumavis <kumavis@users.noreply.github.com>2017-09-28 01:44:52 +0800
committerGitHub <noreply@github.com>2017-09-28 01:44:52 +0800
commitca0dff06f5d9283e57b452dcc7e85c31b248b8aa (patch)
tree44243d257dfb7f787882578fa14df8f01900fb45 /app/scripts/migrations
parent6ca519e97c4c282023ab6b7788715ff8d7ec8189 (diff)
parent1877c0766c1f3ab46ec89dad0200fb8f75f52bae (diff)
downloadtangerine-wallet-browser-ca0dff06f5d9283e57b452dcc7e85c31b248b8aa.tar
tangerine-wallet-browser-ca0dff06f5d9283e57b452dcc7e85c31b248b8aa.tar.gz
tangerine-wallet-browser-ca0dff06f5d9283e57b452dcc7e85c31b248b8aa.tar.bz2
tangerine-wallet-browser-ca0dff06f5d9283e57b452dcc7e85c31b248b8aa.tar.lz
tangerine-wallet-browser-ca0dff06f5d9283e57b452dcc7e85c31b248b8aa.tar.xz
tangerine-wallet-browser-ca0dff06f5d9283e57b452dcc7e85c31b248b8aa.tar.zst
tangerine-wallet-browser-ca0dff06f5d9283e57b452dcc7e85c31b248b8aa.zip
Merge pull request #2153 from MetaMask/BreakOutKeyringController
Break out keyring controller into separate module
Diffstat (limited to 'app/scripts/migrations')
-rw-r--r--app/scripts/migrations/_multi-keyring.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/migrations/_multi-keyring.js b/app/scripts/migrations/_multi-keyring.js
index 253aa3d9d..7a4578ea7 100644
--- a/app/scripts/migrations/_multi-keyring.js
+++ b/app/scripts/migrations/_multi-keyring.js
@@ -10,7 +10,7 @@ which we dont have access to at the time of this writing.
const ObservableStore = require('obs-store')
const ConfigManager = require('../../app/scripts/lib/config-manager')
const IdentityStoreMigrator = require('../../app/scripts/lib/idStore-migrator')
-const KeyringController = require('../../app/scripts/lib/keyring-controller')
+const KeyringController = require('eth-keyring-controller')
const password = 'obviously not correct'