aboutsummaryrefslogtreecommitdiffstats
path: root/app/scripts
diff options
context:
space:
mode:
authorkumavis <aaron@kumavis.me>2017-10-11 05:14:43 +0800
committerkumavis <aaron@kumavis.me>2017-10-11 05:14:43 +0800
commit4d273d3ceade861d24dceed96a0f5d5f3dc229ae (patch)
treeca273a08a039035aa25c396e651dcbdf96e841a6 /app/scripts
parentefa92a7fc5925533f72e876c9bf84df0a6258d4a (diff)
downloadtangerine-wallet-browser-4d273d3ceade861d24dceed96a0f5d5f3dc229ae.tar
tangerine-wallet-browser-4d273d3ceade861d24dceed96a0f5d5f3dc229ae.tar.gz
tangerine-wallet-browser-4d273d3ceade861d24dceed96a0f5d5f3dc229ae.tar.bz2
tangerine-wallet-browser-4d273d3ceade861d24dceed96a0f5d5f3dc229ae.tar.lz
tangerine-wallet-browser-4d273d3ceade861d24dceed96a0f5d5f3dc229ae.tar.xz
tangerine-wallet-browser-4d273d3ceade861d24dceed96a0f5d5f3dc229ae.tar.zst
tangerine-wallet-browser-4d273d3ceade861d24dceed96a0f5d5f3dc229ae.zip
lint fixes
Diffstat (limited to 'app/scripts')
-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]