From fec4c50657c0be5bdae9dd211ef4b1a6ebb1be43 Mon Sep 17 00:00:00 2001 From: kumavis Date: Wed, 2 May 2018 18:03:59 -0700 Subject: controllers - network - move default config out of first-time-state --- app/scripts/controllers/network/network.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) (limited to 'app/scripts/controllers/network/network.js') diff --git a/app/scripts/controllers/network/network.js b/app/scripts/controllers/network/network.js index 826ce89c3..5496f8a68 100644 --- a/app/scripts/controllers/network/network.js +++ b/app/scripts/controllers/network/network.js @@ -19,14 +19,27 @@ const { const LOCALHOST_RPC_URL = 'http://localhost:8545' const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET] +const env = process.env.METAMASK_ENV +const METAMASK_DEBUG = process.env.METAMASK_DEBUG +const testMode = (METAMASK_DEBUG || env === 'test') + +const defaultProviderConfig = { + type: testMode ? RINKEBY : MAINNET, +} + module.exports = class NetworkController extends EventEmitter { - constructor (config) { + constructor (opts = {}) { super() + // parse options + const providerConfig = opts.provider || defaultProviderConfig + console.log('providerStore:', providerConfig) + // create stores + this.providerStore = new ObservableStore(providerConfig) this.networkStore = new ObservableStore('loading') - this.providerStore = new ObservableStore(config.provider) this.store = new ComposedStore({ provider: this.providerStore, network: this.networkStore }) + // create event emitter proxy this._proxy = createEventEmitterProxy() this.on('networkDidChange', this.lookupNetwork) -- cgit