aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--app/scripts/controllers/network.js9
-rw-r--r--app/scripts/metamask-controller.js2
2 files changed, 3 insertions, 8 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 412967dbe..f4665baf8 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -1,6 +1,5 @@
const assert = require('assert')
const EventEmitter = require('events')
-const createMetamaskProvider = require('web3-provider-engine/zero.js')
const ObservableStore = require('obs-store')
const ComposedStore = require('obs-store/lib/composed')
const extend = require('xtend')
@@ -77,10 +76,10 @@ module.exports = class NetworkController extends EventEmitter {
assert(type !== 'rpc', `NetworkController.setProviderType - cannot connect by type "rpc"`)
// skip if type already matches
if (type === this.getProviderConfig().type) return
- // lookup rpcTarget for type
+ // lookup rpcTarget for typecreateMetamaskProvider
const rpcTarget = this.getRpcAddressForType(type)
assert(rpcTarget, `NetworkController - unknown rpc address for type "${type}"`)
- // update connection
+ // update connectioncreateMetamaskProvider
this.providerStore.updateState({ type, rpcTarget })
this._switchNetwork({ rpcUrl: rpcTarget })
}
@@ -110,10 +109,6 @@ module.exports = class NetworkController extends EventEmitter {
this._setClient(client)
}
- _createMetamaskProvider(providerParams) {
- const { provider, blockTracker } = createEthRpcClient(providerParams)
- }
-
_setClient (newClient) {
// teardown old client
const oldClient = this._currentClient
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index 67bbdc15a..a742f3cba 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -478,7 +478,7 @@ module.exports = class MetamaskController extends EventEmitter {
result.push(selectedAddress)
}
return result
- },
+ }
addNewAccount (cb) {
const primaryKeyring = this.keyringController.getKeyringsByType('HD Key Tree')[0]