Merge e5b05f4 into 6a133ab

gulp/config.js

@@ -14,8 +14,7 @@ export default {
     lintableFiles: [
         scripts,
         './*.js',
-        './gulp/**/*.js'
-        // Disable linting tests until we've finished converting them to ES6
-        // './test/**/*.js'
+        './gulp/**/*.js',
+        './test/**/*.js'
     ]
 };

package.json

@@ -78,6 +78,7 @@
     "coveralls": "^3.0.0",
     "crypto-js": "^3.1.9-1",
     "del": "^3.0.0",
+    "eslint": "^4.12.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-import": "^2.8.0",
     "ethereumjs-wallet": "^0.6.0",

packages/web3-core-method/src/index.js

@@ -370,7 +370,6 @@ Method.prototype._confirmTransaction = function (defer, result, payload) {
                 timeoutCount++;
 
                 if (timeoutCount - 1 >= TIMEOUTBLOCK) {
-                    console.error(result, payload);
                     sub.unsubscribe();
                     promiseResolved = true;
                     return utils._fireError(new Error('Transaction was not mined within 50 blocks, please make sure your transaction was properly send. Be aware that it might still be mined!'), defer.eventEmitter, defer.reject);

packages/web3-utils/src/soliditySha3.js

@@ -228,9 +228,6 @@ var soliditySha3 = function () {
 
     var hexArgs = _.map(args, _processSoliditySha3Args);
 
-    // console.log(args, hexArgs);
-    // console.log('0x'+ hexArgs.join(''));
-
     return utils.sha3('0x'+ hexArgs.join(''));
 };
 

test/1_givenProvider-ethereumProvider.js

@@ -1,36 +1,25 @@
-var chai = require('chai');
-var assert = chai.assert;
+import { assert } from 'chai';
 
-global.ethereumProvider = {bzz: 'http://givenProvider:8500'};
-
-
-describe('Web3.providers.givenProvider', function () {
-    describe('should be set if ethereumProvider is available ', function () {
-
-        it('when instantiating Web3', function () {
-
-            var Web3 = require('../packages/web3');
+global.ethereumProvider = { bzz: 'http://givenProvider:8500' };
 
+describe('Web3.providers.givenProvider', () => {
+    describe('should be set if ethereumProvider is available ', () => {
+        it('when instantiating Web3', () => {
+            // eslint-disable-next-line global-require
+            const Web3 = require('../packages/web3');
             assert.deepEqual(Web3.givenProvider, global.ethereumProvider);
-
         });
 
-        it('when instantiating Eth', function () {
-
-            var Eth = require('../packages/web3-eth');
-
+        it('when instantiating Eth', () => {
+            // eslint-disable-next-line global-require
+            const Eth = require('../packages/web3-eth');
             assert.deepEqual(Eth.givenProvider, global.ethereumProvider);
-
         });
 
-        it('when instantiating Bzz', function () {
-
-            var Bzz = require('../packages/web3-bzz');
-
+        it('when instantiating Bzz', () => {
+            // eslint-disable-next-line global-require
+            const Bzz = require('../packages/web3-bzz');
             assert.deepEqual(Bzz.givenProvider, global.ethereumProvider.bzz);
-
         });
-
     });
 });
-

test/2_givenProvider-currentProvider.js

@@ -1,29 +1,21 @@
-var chai = require('chai');
-var assert = chai.assert;
+import { assert } from 'chai';
 
 global.web3 = {
-    currentProvider: {bzz: 'http://givenProvider:8500'}
+    currentProvider: { bzz: 'http://givenProvider:8500' }
 };
 
-
-describe('Web3.providers.givenProvider', function () {
-    describe('should be set if web3.currentProvider is available ', function () {
-
-        it('when instantiating Web3', function () {
-
-            var Web3 = require('../packages/web3');
-
+describe('Web3.providers.givenProvider', () => {
+    describe('should be set if web3.currentProvider is available ', () => {
+        it('when instantiating Web3', () => {
+            // eslint-disable-next-line global-require
+            const Web3 = require('../packages/web3');
             assert.deepEqual(Web3.givenProvider, global.web3.currentProvider);
-
         });
 
-        it('when instantiating Eth', function () {
-
-            var Eth = require('../packages/web3-eth');
-
+        it('when instantiating Eth', () => {
+            // eslint-disable-next-line global-require
+            const Eth = require('../packages/web3-eth');
             assert.deepEqual(Eth.givenProvider, global.web3.currentProvider);
-
         });
     });
 });
-