m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

network controller - refactor to use _setProvider

Browse Source
This commit is contained in:
kumavis 2017-09-27 14:44:13 -07:00
parent c781e11c7a
commit f2d9b75e94
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
app/scripts/controllers/network.js
View File

@ -15,17 +15,16 @@ module.exports = class NetworkController extends EventEmitter {
this.networkStore = new ObservableStore('loading') this.networkStore = new ObservableStore('loading')
this.providerStore = new ObservableStore(config.provider) this.providerStore = new ObservableStore(config.provider)
this.store = new ComposedStore({ provider: this.providerStore, network: this.networkStore }) this.store = new ComposedStore({ provider: this.providerStore, network: this.networkStore })
this._providerListeners = {} this._proxy = createEventEmitterProxy()
this.on('networkDidChange', this.lookupNetwork) this.on('networkDidChange', this.lookupNetwork)
this.providerStore.subscribe((state) => this.switchNetwork({rpcUrl: state.rpcTarget})) this.providerStore.subscribe((state) => this.switchNetwork({ rpcUrl: state.rpcTarget }))
} }
initializeProvider (opts, providerContructor = MetaMaskProvider) { initializeProvider (opts, providerContructor = MetaMaskProvider) {
this._providerInit = opts this._baseProviderParams = opts
this._provider = providerContructor(opts) const provider = providerContructor(opts)
this._proxy = createEventEmitterProxy(this._provider) this._setProvider(provider)
this._proxy._blockTracker = createEventEmitterProxy(this._provider._blockTracker)
this._proxy.on('block', this._logBlock.bind(this)) this._proxy.on('block', this._logBlock.bind(this))
this._proxy.on('error', this.verifyNetwork.bind(this)) this._proxy.on('error', this.verifyNetwork.bind(this))
this.ethQuery = new EthQuery(this._proxy) this.ethQuery = new EthQuery(this._proxy)
@ -33,21 +32,33 @@ module.exports = class NetworkController extends EventEmitter {
return this._proxy return this._proxy
} }
switchNetwork (providerInit) { switchNetwork (opts) {
this.setNetworkState('loading') this.setNetworkState('loading')
const newInit = extend(this._providerInit, providerInit) const providerParams = extend(this._baseProviderParams, opts)
this._providerInit = newInit this._baseProviderParams = providerParams
const provider = MetaMaskProvider(providerParams)
this._proxy.removeAllListeners() this._setProvider(provider)
this._proxy.stop()
this._provider = MetaMaskProvider(newInit)
// apply the listners created by other controllers
const blockTrackerHandlers = this._proxy._blockTracker.proxyEventHandlers
this._proxy.setTarget(this._provider)
this._proxy._blockTracker = createEventEmitterProxy(this._provider._blockTracker, blockTrackerHandlers)
this.emit('networkDidChange') 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 () { verifyNetwork () {
// Check network when restoring connectivity: // Check network when restoring connectivity:
if (this.isNetworkLoading()) this.lookupNetwork() if (this.isNetworkLoading()) this.lookupNetwork()

6
test/unit/network-contoller-test.js
View File

@ -20,9 +20,9 @@ describe('# Network Controller', function () {
describe('#provider', function () { describe('#provider', function () {
it('provider should be updatable without reassignment', function () { it('provider should be updatable without reassignment', function () {
networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor) networkController.initializeProvider(networkControllerProviderInit, dummyProviderConstructor)
const provider = networkController.provider const proxy = networkController._proxy
networkController.provider.setTarget({test: true, on: () => {}}) proxy.setTarget({ test: true, on: () => {} })
assert.ok(provider.test) assert.ok(proxy.test)
}) })
}) })
describe('#getNetworkState', function () { describe('#getNetworkState', function () {