aboutsummaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-09-28 05:44:54 +0800
committerkumavis <aaron@kumavis.me>2017-09-28 05:44:54 +0800
commit06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0 (patch)
tree0c9b05a33cc64b7fe7539af4ab18f4579af69db1 /app
parentf2d9b75e94ba52ce34faff0640f494028d037246 (diff)
downloadtangerine-wallet-browser-06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0.tar
tangerine-wallet-browser-06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0.tar.gz
tangerine-wallet-browser-06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0.tar.bz2
tangerine-wallet-browser-06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0.tar.lz
tangerine-wallet-browser-06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0.tar.xz
tangerine-wallet-browser-06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0.tar.zst
tangerine-wallet-browser-06b5dd2096b6bfcdf7d9ebf7c9bb1e40c8aed2e0.zip
network controller - move _setProvider to bottom
Diffstat (limited to 'app')
-rw-r--r--app/scripts/controllers/network.js36
1 files changed, 18 insertions, 18 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 1ed9f7eca..2a17cdae8 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -41,24 +41,6 @@ module.exports = class NetworkController extends EventEmitter {
this.emit('networkDidChange')
}
- _setProvider (provider) {
- // collect old block tracker events
- const oldProvider = this._provider
- let blockTrackerHandlers
- if (oldProvider) {
- // capture old block handlers
- blockTrackerHandlers = oldProvider._blockTracker.proxyEventHandlers
- // tear down
- oldProvider.removeAllListeners()
- oldProvider.stop()
- }
- // override block tracler
- provider._blockTracker = createEventEmitterProxy(provider._blockTracker, blockTrackerHandlers)
- // set as new provider
- this._provider = provider
- this._proxy.setTarget(provider)
- }
-
verifyNetwork () {
// Check network when restoring connectivity:
if (this.isNetworkLoading()) this.lookupNetwork()
@@ -112,6 +94,24 @@ module.exports = class NetworkController extends EventEmitter {
return provider && provider.rpcTarget ? provider.rpcTarget : DEFAULT_RPC
}
+ _setProvider (provider) {
+ // collect old block tracker events
+ const oldProvider = this._provider
+ let blockTrackerHandlers
+ if (oldProvider) {
+ // capture old block handlers
+ blockTrackerHandlers = oldProvider._blockTracker.proxyEventHandlers
+ // tear down
+ oldProvider.removeAllListeners()
+ oldProvider.stop()
+ }
+ // override block tracler
+ provider._blockTracker = createEventEmitterProxy(provider._blockTracker, blockTrackerHandlers)
+ // set as new provider
+ this._provider = provider
+ this._proxy.setTarget(provider)
+ }
+
_logBlock (block) {
log.info(`BLOCK CHANGED: #${block.number.toString('hex')} 0x${block.hash.toString('hex')}`)
this.verifyNetwork()