aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-10-11 08:26:44 +0800
committerkumavis <aaron@kumavis.me>2017-10-11 08:26:44 +0800
commit0f8d7dacb1bada269f38b3f0f73df9e8347bc492 (patch)
tree18df8aa42bd4f3a5e599956874e52c97ae14ba42
parent7d50a56198f2992e908bc97b871210ec2b52123a (diff)
downloadtangerine-wallet-browser-0f8d7dacb1bada269f38b3f0f73df9e8347bc492.tar
tangerine-wallet-browser-0f8d7dacb1bada269f38b3f0f73df9e8347bc492.tar.gz
tangerine-wallet-browser-0f8d7dacb1bada269f38b3f0f73df9e8347bc492.tar.bz2
tangerine-wallet-browser-0f8d7dacb1bada269f38b3f0f73df9e8347bc492.tar.lz
tangerine-wallet-browser-0f8d7dacb1bada269f38b3f0f73df9e8347bc492.tar.xz
tangerine-wallet-browser-0f8d7dacb1bada269f38b3f0f73df9e8347bc492.tar.zst
tangerine-wallet-browser-0f8d7dacb1bada269f38b3f0f73df9e8347bc492.zip
network-controller - use obj-proxy for providerProxy
-rw-r--r--app/scripts/controllers/network.js7
-rw-r--r--package.json4
-rw-r--r--test/unit/network-contoller-test.js25
3 files changed, 11 insertions, 25 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index f4665baf8..64ed4b7c2 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -6,6 +6,7 @@ const extend = require('xtend')
const EthQuery = require('eth-query')
const createEthRpcClient = require('eth-rpc-client')
const createEventEmitterProxy = require('../lib/events-proxy.js')
+const createObjectProxy = require('../lib/obj-proxy.js')
const RPC_ADDRESS_LIST = require('../config.js').network
const DEFAULT_RPC = RPC_ADDRESS_LIST['rinkeby']
@@ -17,7 +18,7 @@ module.exports = class NetworkController extends EventEmitter {
this.networkStore = new ObservableStore('loading')
this.providerStore = new ObservableStore(config.provider)
this.store = new ComposedStore({ provider: this.providerStore, network: this.networkStore })
- this.providerProxy = createEventEmitterProxy()
+ this.providerProxy = createObjectProxy()
this.blockTrackerProxy = createEventEmitterProxy()
this.on('networkDidChange', this.lookupNetwork)
@@ -27,8 +28,8 @@ module.exports = class NetworkController extends EventEmitter {
this._baseProviderParams = _providerParams
const rpcUrl = this.getCurrentRpcAddress()
this._configureStandardClient({ rpcUrl })
- this.providerProxy.on('block', this._logBlock.bind(this))
- this.providerProxy.on('error', this.verifyNetwork.bind(this))
+ this.blockTrackerProxy.on('block', this._logBlock.bind(this))
+ this.blockTrackerProxy.on('error', this.verifyNetwork.bind(this))
this.ethQuery = new EthQuery(this.providerProxy)
this.lookupNetwork()
}
diff --git a/package.json b/package.json
index 3a6be4c61..a5a473bed 100644
--- a/package.json
+++ b/package.json
@@ -71,11 +71,11 @@
"eth-contract-metadata": "^1.1.4",
"eth-hd-keyring": "^1.2.1",
"eth-json-rpc-filters": "^1.2.2",
- "eth-json-rpc-middleware": "^1.4.1",
+ "eth-json-rpc-middleware": "^1.4.2",
"eth-keyring-controller": "^2.1.0",
"eth-phishing-detect": "^1.1.4",
"eth-query": "^2.1.2",
- "eth-rpc-client": "^1.0.0",
+ "eth-rpc-client": "^1.0.3",
"eth-sig-util": "^1.4.0",
"eth-simple-keyring": "^1.1.1",
"eth-token-tracker": "^1.1.4",
diff --git a/test/unit/network-contoller-test.js b/test/unit/network-contoller-test.js
index 0b3b5adeb..42ca40c56 100644
--- a/test/unit/network-contoller-test.js
+++ b/test/unit/network-contoller-test.js
@@ -14,15 +14,15 @@ describe('# Network Controller', function () {
},
})
- networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
+ networkController.initializeProvider(networkControllerProviderInit)
})
describe('network', function () {
describe('#provider', function () {
it('provider should be updatable without reassignment', function () {
- networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
- const proxy = networkController._proxy
- proxy.setTarget({ test: true, on: () => {} })
- assert.ok(proxy.test)
+ networkController.initializeProvider(networkControllerProviderInit)
+ const providerProxy = networkController.providerProxy
+ providerProxy.setTarget({ test: true })
+ assert.ok(providerProxy.test)
})
})
describe('#getNetworkState', function () {
@@ -66,19 +66,4 @@ describe('# Network Controller', function () {
})
})
-function dummyProviderConstructor() {
- return {
- // provider
- sendAsync: noop,
- // block tracker
- _blockTracker: {},
- start: noop,
- stop: noop,
- on: noop,
- addListener: noop,
- once: noop,
- removeAllListeners: noop,
- }
-}
-
function noop() {} \ No newline at end of file