diff options
| -rw-r--r-- | .eslintrc | 6 | ||||
| -rw-r--r-- | app/scripts/background.js | 3 | ||||
| -rw-r--r-- | package.json | 2 |
3 files changed, 4 insertions, 7 deletions
@@ -37,7 +37,7 @@ "block-spacing": [2, "always"], "brace-style": [2, "1tbs", { "allowSingleLine": true }], "camelcase": [2, { "properties": "never" }], - "comma-dangle": [2, "never"], + "comma-dangle": [2, "always-multiline"], "comma-spacing": [2, { "before": false, "after": true }], "comma-style": [2, "last"], "constructor-super": 2, @@ -134,8 +134,8 @@ "quotes": [2, "single", "avoid-escape"], "semi": [2, "never"], "semi-spacing": [2, { "before": false, "after": true }], - "space-before-blocks": [2, "always"], - "space-before-function-paren": [2, "always"], + "space-before-blocks": [0, "always"], + "space-before-function-paren": [0, "always"], "space-in-parens": [2, "never"], "space-infix-ops": 2, "space-unary-ops": [2, { "words": true, "nonwords": false }], diff --git a/app/scripts/background.js b/app/scripts/background.js index 3ad95d3e9..b07331046 100644 --- a/app/scripts/background.js +++ b/app/scripts/background.js @@ -1,11 +1,9 @@ const urlUtil = require('url') const Dnode = require('dnode') const eos = require('end-of-stream') -const combineStreams = require('pumpify') const extend = require('xtend') const EthStore = require('eth-store') const MetaMaskProvider = require('web3-provider-engine/zero.js') -const ObjectMultiplex = require('./lib/obj-multiplex') const PortStream = require('./lib/port-stream.js') const IdentityStore = require('./lib/idStore') const createUnlockRequestNotification = require('./lib/notifications.js').createUnlockRequestNotification @@ -55,7 +53,6 @@ function setupTrustedCommunication(connectionStream, originDomain){ // state and network // -var providerConfig = configManager.getProvider() var idStore = new IdentityStore() var providerOpts = { diff --git a/package.json b/package.json index 65d813da9..8c1f119cb 100644 --- a/package.json +++ b/package.json @@ -5,7 +5,7 @@ "private": true, "scripts": { "start": "gulp dev", - "test": "mocha --require test/helper.js --compilers js:babel-register --recursive", + "test": "mocha --require test/helper.js --compilers js:babel-register --recursive && gulp lint", "watch": "mocha watch --compilers js:babel-register --recursive" }, "browserify": { |