diff options
| author | kumavis <kumavis@users.noreply.github.com> | 2017-09-28 01:44:52 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-28 01:44:52 +0800 |
| commit | ca0dff06f5d9283e57b452dcc7e85c31b248b8aa (patch) | |
| tree | 44243d257dfb7f787882578fa14df8f01900fb45 /app/scripts/metamask-controller.js | |
| parent | 6ca519e97c4c282023ab6b7788715ff8d7ec8189 (diff) | |
| parent | 1877c0766c1f3ab46ec89dad0200fb8f75f52bae (diff) | |
| download | tangerine-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/metamask-controller.js')
| -rw-r--r-- | app/scripts/metamask-controller.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js index 0f850b7f5..bbac5ed08 100644 --- a/app/scripts/metamask-controller.js +++ b/app/scripts/metamask-controller.js @@ -14,7 +14,7 @@ const createOriginMiddleware = require('./lib/createOriginMiddleware') const createLoggerMiddleware = require('./lib/createLoggerMiddleware') const createProviderMiddleware = require('./lib/createProviderMiddleware') const setupMultiplex = require('./lib/stream-utils.js').setupMultiplex -const KeyringController = require('./keyring-controller') +const KeyringController = require('eth-keyring-controller') const NetworkController = require('./controllers/network') const PreferencesController = require('./controllers/preferences') const CurrencyController = require('./controllers/currency') |