lint fix

app/scripts/controllers/network/createInfuraClient.js

@@ -1,7 +1,10 @@
 const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
 const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
 const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-ref')
-const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-cache')
+const createBlockCacheMiddleware = require('eth-json-rpc-middleware/block-cache')
+const createInflightMiddleware = require('eth-json-rpc-middleware/inflight')
+const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
+const createInfuraMiddleware = require('eth-json-rpc-infura')
 const BlockTracker = require('eth-block-tracker')
 
 module.exports = createInfuraClient

app/scripts/controllers/network/createJsonRpcClient.js

@@ -2,7 +2,9 @@ const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
 const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
 const createFetchMiddleware = require('eth-json-rpc-middleware/fetch')
 const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-ref')
-const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-cache')
+const createBlockCacheMiddleware = require('eth-json-rpc-middleware/block-cache')
+const createInflightMiddleware = require('eth-json-rpc-middleware/inflight')
+const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
 const BlockTracker = require('eth-block-tracker')
 
 module.exports = createJsonRpcClient

app/scripts/controllers/network/createLocalhostClient.js

@@ -2,7 +2,7 @@ const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
 const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
 const createFetchMiddleware = require('eth-json-rpc-middleware/fetch')
 const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-ref')
-const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-cache')
+const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
 const BlockTracker = require('eth-block-tracker')
 
 module.exports = createLocalhostClient

app/scripts/controllers/network/createMetamaskMiddleware.js

@@ -12,7 +12,7 @@ function createMetamaskMiddleware({
   processEthSignMessage,
   processTypedMessage,
   processPersonalMessage,
-  getPendingNonce
+  getPendingNonce,
 }) {
   const metamaskMiddleware = mergeMiddleware([
     createScaffoldMiddleware({
@@ -28,7 +28,7 @@ function createMetamaskMiddleware({
       processPersonalMessage,
     }),
     createPendingNonceMiddleware({ getPendingNonce }),
-  })
+  ])
   return metamaskMiddleware
 }
 

app/scripts/controllers/network/network.js

@@ -2,8 +2,9 @@ const assert = require('assert')
 const EventEmitter = require('events')
 const ObservableStore = require('obs-store')
 const ComposedStore = require('obs-store/lib/composed')
-const extend = require('xtend')
 const EthQuery = require('eth-query')
+const JsonRpcEngine = require('json-rpc-engine')
+const providerFromEngine = require('eth-json-rpc-middle/providerFromEngine')
 const log = require('loglevel')
 const createMetamaskMiddleware = require('./createMetamaskMiddleware')
 const createInfuraClient = require('./createInfuraClient')
@@ -19,7 +20,6 @@ const {
   MAINNET,
   LOCALHOST,
 } = require('./enums')
-const LOCALHOST_RPC_URL = 'http://localhost:8545'
 const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET]
 
 const env = process.env.METAMASK_ENV