Merge pull request #510 from JoinColony/maintenance/317-test-refactoring

Upgrade to babel 7 and resolve source map support failure in tests

.circleci/config.yml

@@ -2,7 +2,7 @@ version: 2
 
 job_common: &job_common
   docker:
-    - image: circleci/node:9.11.2-stretch
+    - image: circleci/node:10.12-stretch
   working_directory: ~/colonyNetwork
 step_save_cache: &step_save_cache
   save_cache:

.nvmrc

@@ -1 +1 @@
-9.11.2
+10.12

babel.config.js

@@ -0,0 +1,8 @@
+const babelConfig = {
+  presets: ["@babel/preset-env"]
+};
+
+module.exports = babel => {
+  babel.cache.never();
+  return babelConfig;
+};

helpers/test-helper.js

@@ -467,8 +467,13 @@ export async function advanceMiningCycleNoContest({ colonyNetwork, client, miner
   } else {
     const accounts = await web3GetAccounts();
     minerAddress = minerAddress || accounts[5]; // eslint-disable-line no-param-reassign
-    await repCycle.submitRootHash("0x00", 0, "0x00", 10, { from: minerAddress });
+    try {
+      await repCycle.submitRootHash("0x00", 0, "0x00", 10, { from: minerAddress });
+    } catch (err) {
+      console.log("advanceMiningCycleNoContest error thrown by .submitRootHash", err);
+    }
   }
+
   await repCycle.confirmNewHash(0);
 }
 

package.json

@@ -7,8 +7,8 @@
     "eslint-staged": "bash ./scripts/eslint.sh",
     "eslint": "eslint .",
     "solium": "solium --dir .",
-    "check:storagevars": "./node_modules/babel-cli/bin/babel-node.js ./scripts/check-storage.js",
-    "check:recoverymods": "./node_modules/babel-cli/bin/babel-node.js ./scripts/check-recovery.js",
+    "check:storagevars": "./node_modules/@babel/node/bin/babel-node.js ./scripts/check-storage.js",
+    "check:recoverymods": "./node_modules/@babel/node/bin/babel-node.js ./scripts/check-recovery.js",
     "version:contracts": "bash ./scripts/version-contracts.sh",
     "generate:test:contracts": "bash ./scripts/generate-test-contracts.sh",
     "clean:test:contracts": "rimraf ./contracts/*Updated*.*",
@@ -52,15 +52,15 @@
   },
   "homepage": "https://github.com/JoinColony/colonyNetwork#readme",
   "devDependencies": {
+    "@babel/core": "^7.0.0",
+    "@babel/node": "^7.2.2",
+    "@babel/polyfill": "^7.2.5",
+    "@babel/preset-env": "^7.3.1",
+    "@babel/register": "^7.0.0",
     "@colony/colony-js-contract-loader-fs": "1.8.1",
     "@colony/eslint-config-colony": "7.0.0",
     "async-request": "^1.2.0",
-    "babel-cli": "^6.26.0",
     "babel-eslint": "^10.0.1",
-    "babel-plugin-transform-runtime": "^6.23.0",
-    "babel-preset-es2015": "^6.24.1",
-    "babel-preset-stage-2": "^6.24.1",
-    "babel-register": "^6.26.0",
     "bn-chai": "^1.0.1",
     "bn.js": "^4.11.8",
     "chai": "^4.2.0",

packages/colony-js-contract-loader-network/.babelrc

@@ -0,0 +1,7 @@
+{
+  "env": {
+    "test": {
+      "presets": ["@babel/preset-env"]
+    }
+  }
+}

packages/colony-js-contract-loader-network/package.json

@@ -12,14 +12,15 @@
   "author": "Christian Maniewski <[email protected]>",
   "license": "GPL-3.0",
   "dependencies": {
+    "@babel/runtime": "^7.0.0",
     "@colony/colony-js-contract-loader": "1.8.1",
-    "assert": "^1.4.1",
-    "babel-runtime": "^6.26.0"
+    "assert": "^1.4.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.26.0",
-    "babel-jest": "^23.0.1",
-    "jest": "^23.1.0",
+    "@babel/cli": "^7.0.0",
+    "babel-core": "^7.0.0-bridge.0",
+    "babel-jest": "^23.6.0",
+    "jest": "^23.6.0",
     "shx": "^0.3.0"
   }
 }

packages/reputation-miner/ReputationMiner.js

@@ -3,7 +3,6 @@ import PatriciaTreeNoHash from "./patriciaNoHashKey";
 
 const BN = require("bn.js");
 const web3Utils = require("web3-utils");
-const ganache = require("ganache-core");
 const ethers = require("ethers");
 const sqlite = require("sqlite");
 
@@ -26,6 +25,10 @@ class ReputationMiner {
 
     this.useJsTree = useJsTree;
     if (!this.useJsTree) {
+      // If this require is global, line numbers are broken in all our tests. If we move it here, it's only an issue if we're not
+      // using the JS tree. There is an issue open at ganache-core about this, and this require will have to remain here until it's fixed. 
+      // https://github.com/trufflesuite/ganache-core/issues/287
+      const ganache = require("ganache-core"); // eslint-disable-line global-require
       const ganacheProvider = ganache.provider({
         network_id: 515,
         vmErrorsOnRPCResponse: false,

packages/reputation-miner/bin/index.js

@@ -1,5 +1,5 @@
-require("babel-register")({
-  presets: ["env"]
+require("@babel/register")({
+  presets: ["@babel/preset-env"]
 });
 
 const path = require("path");

packages/reputation-miner/package.json

@@ -24,7 +24,7 @@
     "yargs": "^12.0.1"
   },
   "devDependencies": {
-    "babel-preset-env": "^1.7.0",
-    "babel-register": "^6.26.0"
+    "@babel/preset-env": "^7.3.1",
+    "@babel/register": "^7.0.0"
   }
 }

packages/reputation-miner/test/MaliciousReputationMinerUnsure.js

@@ -1,6 +1,6 @@
 import ReputationMinerTestWrapper from "./ReputationMinerTestWrapper";
 
-class MaliciousReputationMinerClaimNew extends ReputationMinerTestWrapper {
+class MaliciousReputationMinerUnsure extends ReputationMinerTestWrapper {
   // Not really sure how to describe this malicous mining client...
   // It ends up proving a too-large newest reputation for the nNodes it claimed in the
   // JRH (so in the test in question, the intermediate value had 6 nodes, but it proves
@@ -38,4 +38,4 @@ class MaliciousReputationMinerClaimNew extends ReputationMinerTestWrapper {
   }
 }
 
-export default MaliciousReputationMinerClaimNew;
+export default MaliciousReputationMinerUnsure;

test-gas-costs/gasCosts.js

@@ -214,14 +214,19 @@ contract("All", function(accounts) {
       await advanceMiningCycleNoContest({ colonyNetwork, test: this });
       await advanceMiningCycleNoContest({ colonyNetwork, test: this, minerAddress: STAKER1 });
 
-      const goodClient = new ReputationMinerTestWrapper({ loader: contractLoader, minerAddress: STAKER1, realProviderPort: REAL_PROVIDER_PORT });
+      const goodClient = new ReputationMinerTestWrapper({
+        loader: contractLoader,
+        minerAddress: STAKER1,
+        realProviderPort: REAL_PROVIDER_PORT,
+        useJsTree: true
+      });
       const badClient = new MaliciousReputationMinerExtraRep(
-        { loader: contractLoader, minerAddress: STAKER2, realProviderPort: REAL_PROVIDER_PORT },
+        { loader: contractLoader, minerAddress: STAKER2, realProviderPort: REAL_PROVIDER_PORT, useJsTree: true },
         1,
         0xfffffffff
       );
       const badClient2 = new MaliciousReputationMinerExtraRep(
-        { loader: contractLoader, minerAddress: STAKER3, realProviderPort: REAL_PROVIDER_PORT },
+        { loader: contractLoader, minerAddress: STAKER3, realProviderPort: REAL_PROVIDER_PORT, useJsTree: true },
         2,
         0xfffffffff
       );

truffle.js

@@ -1,4 +1,5 @@
-require("babel-register");
+require("@babel/register");
+require("@babel/polyfill");
 
 module.exports = {
   networks: {