Merge branch 'master' into i#2720

feature/default_network_editable
frankiebee 7 years ago
commit 0daeaeb4a8
  1. 2
      app/scripts/controllers/network.js
  2. 2
      package.json

@ -132,7 +132,7 @@ module.exports = class NetworkController extends EventEmitter {
}
_configureInfuraProvider (opts) {
console.log('_configureInfuraProvider', opts)
log.info('_configureInfuraProvider', opts)
const blockTrackerProvider = createInfuraProvider({
network: opts.type,
})

@ -13,7 +13,7 @@
"dist": "npm run dist:clear && npm install && gulp dist",
"dist:clear": "rm -rf node_modules/eth-contract-metadata && rm -rf node_modules/eth-phishing-detect",
"test": "npm run lint && npm run test:coverage && npm run test:integration",
"test:unit": "METAMASK_ENV=test mocha --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
"test:unit": "METAMASK_ENV=test mocha --exit --compilers js:babel-core/register --require test/helper.js --recursive \"test/unit/**/*.js\"",
"test:single": "METAMASK_ENV=test mocha --require test/helper.js",
"test:integration": "npm run test:flat && npm run test:mascara",
"test:coverage": "nyc npm run test:unit && npm run test:coveralls-upload",

Loading…
Cancel
Save