aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHsuan Lee <boczeratul@gmail.com>2018-10-22 14:04:32 +0800
committerHsuan Lee <hsuan@cobinhood.com>2018-12-10 18:18:31 +0800
commit3a77e5a04c47257127f83163928d4b32540c5824 (patch)
treeafd08ce611cd51ed5685984cae589ab602e42d6d
parentf1ce595de21c2dcc8f48928622c384de2c53c0a3 (diff)
downloaddexon-wallet-3a77e5a04c47257127f83163928d4b32540c5824.tar.gz
dexon-wallet-3a77e5a04c47257127f83163928d4b32540c5824.tar.zst
dexon-wallet-3a77e5a04c47257127f83163928d4b32540c5824.zip
Rename provider stream
-rw-r--r--app/scripts/contentscript.js2
-rw-r--r--app/scripts/metamask-controller.js4
-rw-r--r--app/scripts/popup-core.js2
-rw-r--r--mascara/src/background.js2
-rw-r--r--ui/app/components/send/tests/send-selectors-test-data.js2
5 files changed, 6 insertions, 6 deletions
diff --git a/app/scripts/contentscript.js b/app/scripts/contentscript.js
index 5292c015..202fe663 100644
--- a/app/scripts/contentscript.js
+++ b/app/scripts/contentscript.js
@@ -110,7 +110,7 @@ function setupStreams () {
phishingStream.once('data', redirectToPhishingWarning)
// ignore unused channels (handled by background, inpage)
- mux.ignoreStream('provider')
+ mux.ignoreStream('dekuSanProvider')
mux.ignoreStream('dekuSanPublicConfig')
}
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 68691bfd..4975fafe 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -1231,7 +1231,7 @@ module.exports = class MetamaskController extends EventEmitter {
// setup multiplexing
const mux = setupMultiplex(connectionStream)
// connect features
- this.setupProviderConnection(mux.createStream('provider'), originDomain)
+ this.setupProviderConnection(mux.createStream('dekuSanProvider'), originDomain)
this.setupPublicConfig(mux.createStream('dekuSanPublicConfig'))
}
@@ -1250,7 +1250,7 @@ module.exports = class MetamaskController extends EventEmitter {
const mux = setupMultiplex(connectionStream)
// connect features
this.setupControllerConnection(mux.createStream('controller'))
- this.setupProviderConnection(mux.createStream('provider'), originDomain)
+ this.setupProviderConnection(mux.createStream('dekuSanProvider'), originDomain)
}
/**
diff --git a/app/scripts/popup-core.js b/app/scripts/popup-core.js
index f455ec53..c69c1512 100644
--- a/app/scripts/popup-core.js
+++ b/app/scripts/popup-core.js
@@ -35,7 +35,7 @@ function connectToAccountManager (connectionStream, cb) {
var mx = setupMultiplex(connectionStream)
// connect features
setupControllerConnection(mx.createStream('controller'), cb)
- setupWeb3Connection(mx.createStream('provider'))
+ setupWeb3Connection(mx.createStream('dekuSanProvider'))
}
/**
diff --git a/mascara/src/background.js b/mascara/src/background.js
index 6f54b396..8694d2f1 100644
--- a/mascara/src/background.js
+++ b/mascara/src/background.js
@@ -118,7 +118,7 @@ async function setupController (initState, client) {
// setup multiplexing
var mx = setupMultiplex(connectionStream)
// connect features
- controller.setupProviderConnection(mx.createStream('provider'), originDomain)
+ controller.setupProviderConnection(mx.createStream('dekuSanProvider'), originDomain)
controller.setupPublicConfig(mx.createStream('dekuSanPublicConfig'))
}
}
diff --git a/ui/app/components/send/tests/send-selectors-test-data.js b/ui/app/components/send/tests/send-selectors-test-data.js
index 30a2666c..09cadfd0 100644
--- a/ui/app/components/send/tests/send-selectors-test-data.js
+++ b/ui/app/components/send/tests/send-selectors-test-data.js
@@ -148,7 +148,7 @@ module.exports = {
},
],
'selectedAddress': '0xd85a4b6a394794842887b8284293d69163007bbb',
- 'provider': {
+ 'dekuSanProvider': {
'type': 'testnet',
},
'shapeShiftTxList': [