aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrankiebee <frankie.diamond@gmail.com>2017-12-16 04:59:43 +0800
committerfrankiebee <frankie.diamond@gmail.com>2017-12-16 04:59:43 +0800
commit0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7 (patch)
tree6d622bda6cc6e2401ee71714f65e80f8222f1416
parent828734b977f7c26c249c81af73fc8eef0b66e416 (diff)
parent6861a218e7be86efe44496d99c07adf599f504f4 (diff)
downloadtangerine-wallet-browser-0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7.tar
tangerine-wallet-browser-0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7.tar.gz
tangerine-wallet-browser-0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7.tar.bz2
tangerine-wallet-browser-0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7.tar.lz
tangerine-wallet-browser-0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7.tar.xz
tangerine-wallet-browser-0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7.tar.zst
tangerine-wallet-browser-0daeaeb4a84514c9a703f1e38ab02e26b3e5a9a7.zip
Merge branch 'master' into i#2720
-rw-r--r--app/scripts/controllers/network.js2
-rw-r--r--package.json2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/scripts/controllers/network.js b/app/scripts/controllers/network.js
index 65d58008a..377ba6eca 100644
--- a/app/scripts/controllers/network.js
+++ b/app/scripts/controllers/network.js
@@ -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,
})
diff --git a/package.json b/package.json
index fce548066..7184e3ea8 100644
--- a/package.json
+++ b/package.json
@@ -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",