Update buidler / reorg dependencies

buidler.config.js

@@ -1,18 +0,0 @@
-
-// Mute compiler warnings - this will need to be addressed properly in
-// the Buidler plugin by overloading TASK_COMPILE_COMPILE.
-const originalLog = console.log;
-console.warn = () => {};
-console.log = val => val === '\n' ? null : originalLog(val);
-
-module.exports = {
-  solc: {
-    version: "0.5.8"
-  },
-  paths: {
-    artifacts: "./test/artifacts",
-    cache: "./test/cache",
-    test: "./test/units",
-    sources: "./test/sources/contracts",
-  }
-}

package.json

@@ -27,9 +27,9 @@
     "@truffle/provider": "^0.1.17",
     "chalk": "^2.4.2",
     "death": "^1.1.0",
-    "fs-extra": "^8.1.0",
     "detect-port": "^1.3.0",
-    "ganache-core-sc": "2.7.0-sc.0",
+    "fs-extra": "^8.1.0",
+    "ganache-cli": "6.7.0",
     "ghost-testrpc": "^0.0.2",
     "global-modules": "^2.0.0",
     "globby": "^10.0.1",
@@ -39,15 +39,17 @@
     "node-emoji": "^1.10.0",
     "pify": "^4.0.1",
     "shelljs": "^0.8.3",
-    "solidity-parser-antlr": "^0.4.7",
+    "solidity-parser-antlr": "0.4.7",
     "web3": "1.2.1",
     "web3-utils": "^1.0.0"
   },
   "devDependencies": {
-    "@nomiclabs/buidler": "^1.0.0-beta.8",
+    "@nomiclabs/buidler": "^1.0.1",
-    "@nomiclabs/buidler-truffle5": "^1.0.0-beta.8",
+    "@nomiclabs/buidler-truffle5": "^1.0.1",
-    "@nomiclabs/buidler-web3": "^1.0.0-beta.8",
+    "@nomiclabs/buidler-web3": "^1.0.1",
+    "@truffle/contract": "^4.0.36",
     "decache": "^4.5.1",
+    "ganache-core-sc": "^2.7.0-sc.0",
     "mocha": "5.2.0",
     "nyc": "^14.1.1",
     "solc": "^0.5.10",

test/util/util.js

@@ -5,7 +5,7 @@
 const fs = require('fs');
 const path = require('path');
 const solc = require('solc');
-const TruffleContract = require('truffle-contract');
+const TruffleContract = require('@truffle/contract');
 
 const Instrumenter = require('./../../lib/instrumenter');
 const DataCollector = require('./../../lib/collector')