aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorWhymarrh Whitby <whymarrh.whitby@gmail.com>2019-07-11 03:01:48 +0800
committerGitHub <noreply@github.com>2019-07-11 03:01:48 +0800
commitf0218bdbbbc54bc5b495d813cf295da18000d136 (patch)
tree00168db4c0610aa8a7c9ac003de75f9cc1305023 /app
parent564818d236d0a9618b4dfda13e69bca9ea891dc7 (diff)
downloadtangerine-wallet-browser-f0218bdbbbc54bc5b495d813cf295da18000d136.tar.gz
tangerine-wallet-browser-f0218bdbbbc54bc5b495d813cf295da18000d136.tar.zst
tangerine-wallet-browser-f0218bdbbbc54bc5b495d813cf295da18000d136.zip
Rename accountManager usages (#6790)
Co-Authored-By: Mark Stacey <markjstacey@gmail.com>
Diffstat (limited to 'app')
-rw-r--r--app/scripts/phishing-detect.js6
-rw-r--r--app/scripts/popup-core.js12
2 files changed, 9 insertions, 9 deletions
diff --git a/app/scripts/phishing-detect.js b/app/scripts/phishing-detect.js
index b30c76b72..266e4fc31 100644
--- a/app/scripts/phishing-detect.js
+++ b/app/scripts/phishing-detect.js
@@ -37,11 +37,11 @@ function start () {
function setupControllerConnection (connectionStream, cb) {
const eventEmitter = new EventEmitter()
- const accountManagerDnode = dnode({
+ const metaMaskControllerDnode = dnode({
sendUpdate (state) {
eventEmitter.emit('update', state)
},
})
- connectionStream.pipe(accountManagerDnode).pipe(connectionStream)
- accountManagerDnode.once('remote', (accountManager) => cb(null, accountManager))
+ connectionStream.pipe(metaMaskControllerDnode).pipe(connectionStream)
+ metaMaskControllerDnode.once('remote', (backgroundConnection) => cb(null, backgroundConnection))
}
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index e964d001d..c08e9fa24 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -19,7 +19,7 @@ function initializePopup ({ container, connectionStream }, cb) {
// setup app
async.waterfall([
(cb) => connectToAccountManager(connectionStream, cb),
- (accountManager, cb) => launchMetamaskUi({ container, accountManager }, cb),
+ (backgroundConnection, cb) => launchMetamaskUi({ container, backgroundConnection }, cb),
], cb)
}
@@ -63,15 +63,15 @@ function setupControllerConnection (connectionStream, cb) {
// this is a really sneaky way of adding EventEmitter api
// to a bi-directional dnode instance
const eventEmitter = new EventEmitter()
- const accountManagerDnode = Dnode({
+ const backgroundDnode = Dnode({
sendUpdate: function (state) {
eventEmitter.emit('update', state)
},
})
- connectionStream.pipe(accountManagerDnode).pipe(connectionStream)
- accountManagerDnode.once('remote', function (accountManager) {
+ connectionStream.pipe(backgroundDnode).pipe(connectionStream)
+ backgroundDnode.once('remote', function (backgroundConnection) {
// setup push events
- accountManager.on = eventEmitter.on.bind(eventEmitter)
- cb(null, accountManager)
+ backgroundConnection.on = eventEmitter.on.bind(eventEmitter)
+ cb(null, backgroundConnection)
})
}