m/metamask-extension
1
0
Fork 0
mirror of https://github.com/kremalicious/metamask-extension.git synced 2024-12-23 09:52:26 +01:00
Code

lint fix

Browse Source
This commit is contained in:
kumavis 2018-05-16 21:08:19 -07:00
parent 088d7930e0
commit b6eff15bd2
5 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/scripts/controllers/network/createInfuraClient.js
View File

@ -1,12 +1,15 @@
const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware') const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware') 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-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') const BlockTracker = require('eth-block-tracker')
module.exports = createInfuraClient module.exports = createInfuraClient
function createInfuraClient({ network }) { function createInfuraClient ({ network }) {
const infuraMiddleware = createInfuraMiddleware({ network }) const infuraMiddleware = createInfuraMiddleware({ network })
const blockProvider = providerFromMiddleware(infuraMiddleware) const blockProvider = providerFromMiddleware(infuraMiddleware)
const blockTracker = new BlockTracker({ provider: blockProvider }) const blockTracker = new BlockTracker({ provider: blockProvider })

6
app/scripts/controllers/network/createJsonRpcClient.js
View File

@ -2,12 +2,14 @@ const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware') const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
const createFetchMiddleware = require('eth-json-rpc-middleware/fetch') 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-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') const BlockTracker = require('eth-block-tracker')
module.exports = createJsonRpcClient module.exports = createJsonRpcClient
function createJsonRpcClient({ rpcUrl }) { function createJsonRpcClient ({ rpcUrl }) {
const fetchMiddleware = createFetchMiddleware({ rpcUrl }) const fetchMiddleware = createFetchMiddleware({ rpcUrl })
const blockProvider = providerFromMiddleware(fetchMiddleware) const blockProvider = providerFromMiddleware(fetchMiddleware)
const blockTracker = new BlockTracker({ provider: blockProvider }) const blockTracker = new BlockTracker({ provider: blockProvider })

4
app/scripts/controllers/network/createLocalhostClient.js
View File

@ -2,12 +2,12 @@ const mergeMiddleware = require('json-rpc-engine/src/mergeMiddleware')
const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware') const createAsyncMiddleware = require('json-rpc-engine/src/createAsyncMiddleware')
const createFetchMiddleware = require('eth-json-rpc-middleware/fetch') 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-ref')
const createBlockRefMiddleware = require('eth-json-rpc-middleware/block-cache') const providerFromMiddleware = require('eth-json-rpc-middleware/providerFromMiddleware')
const BlockTracker = require('eth-block-tracker') const BlockTracker = require('eth-block-tracker')
module.exports = createLocalhostClient module.exports = createLocalhostClient
function createLocalhostClient() { function createLocalhostClient () {
const fetchMiddleware = createFetchMiddleware({ rpcUrl: 'http://localhost:8545/' }) const fetchMiddleware = createFetchMiddleware({ rpcUrl: 'http://localhost:8545/' })
const blockProvider = providerFromMiddleware(fetchMiddleware) const blockProvider = providerFromMiddleware(fetchMiddleware)
const blockTracker = new BlockTracker({ provider: blockProvider, pollingInterval: 1000 }) const blockTracker = new BlockTracker({ provider: blockProvider, pollingInterval: 1000 })

6
app/scripts/controllers/network/createMetamaskMiddleware.js
View File

@ -5,14 +5,14 @@ const createWalletSubprovider = require('eth-json-rpc-middleware/wallet')
module.exports = createMetamaskMiddleware module.exports = createMetamaskMiddleware
function createMetamaskMiddleware({ function createMetamaskMiddleware ({
version, version,
getAccounts, getAccounts,
processTransaction, processTransaction,
processEthSignMessage, processEthSignMessage,
processTypedMessage, processTypedMessage,
processPersonalMessage, processPersonalMessage,
getPendingNonce getPendingNonce,
}) { }) {
const metamaskMiddleware = mergeMiddleware([ const metamaskMiddleware = mergeMiddleware([
createScaffoldMiddleware({ createScaffoldMiddleware({
@ -28,7 +28,7 @@ function createMetamaskMiddleware({
processPersonalMessage, processPersonalMessage,
}), }),
createPendingNonceMiddleware({ getPendingNonce }), createPendingNonceMiddleware({ getPendingNonce }),
}) ])
return metamaskMiddleware return metamaskMiddleware
} }

8
app/scripts/controllers/network/network.js
View File

@ -2,8 +2,9 @@ const assert = require('assert')
const EventEmitter = require('events') const EventEmitter = require('events')
const ObservableStore = require('obs-store') const ObservableStore = require('obs-store')
const ComposedStore = require('obs-store/lib/composed') const ComposedStore = require('obs-store/lib/composed')
const extend = require('xtend')
const EthQuery = require('eth-query') const EthQuery = require('eth-query')
const JsonRpcEngine = require('json-rpc-engine')
const providerFromEngine = require('eth-json-rpc-middle/providerFromEngine')
const log = require('loglevel') const log = require('loglevel')
const createMetamaskMiddleware = require('./createMetamaskMiddleware') const createMetamaskMiddleware = require('./createMetamaskMiddleware')
const createInfuraClient = require('./createInfuraClient') const createInfuraClient = require('./createInfuraClient')
@ -19,7 +20,6 @@ const {
MAINNET, MAINNET,
LOCALHOST, LOCALHOST,
} = require('./enums') } = require('./enums')
const LOCALHOST_RPC_URL = 'http://localhost:8545'
const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET] const INFURA_PROVIDER_TYPES = [ROPSTEN, RINKEBY, KOVAN, MAINNET]
const env = process.env.METAMASK_ENV const env = process.env.METAMASK_ENV
@ -58,7 +58,7 @@ module.exports = class NetworkController extends EventEmitter {
} }
// return the proxies so the references will always be good // return the proxies so the references will always be good
getProviderAndBlockTracker() { getProviderAndBlockTracker () {
const provider = this._providerProxy const provider = this._providerProxy
const blockTracker = this._blockTracker const blockTracker = this._blockTracker
return { provider, blockTracker } return { provider, blockTracker }
@ -135,7 +135,7 @@ module.exports = class NetworkController extends EventEmitter {
} else if (type === LOCALHOST) { } else if (type === LOCALHOST) {
this._configureLocalhostProvider() this._configureLocalhostProvider()
// url-based rpc endpoints // url-based rpc endpoints
} else if (type === 'rpc'){ } else if (type === 'rpc') {
this._configureStandardProvider({ rpcUrl: rpcTarget }) this._configureStandardProvider({ rpcUrl: rpcTarget })
} else { } else {
throw new Error(`NetworkController - _configureProvider - unknown type "${type}"`) throw new Error(`NetworkController - _configureProvider - unknown type "${type}"`)