Progress on fixing sol cov

Author: zone117x

bin/exec.js

@@ -10,14 +10,20 @@ const app = new App(config);
 
 death((signal, err) => app.cleanUp(err));
 
-app.generateCoverageEnvironment();
-app.instrumentTarget();
-app.launchTestrpc()
-  .then(() => {
-    app.runTestCommand();
-    app.generateReport();
-  })
-  .catch(err => log(err));
+(async () => {
+
+  try {
+    app.generateCoverageEnvironment();
+    app.instrumentTarget();
+    await app.launchTestrpc();
+    await app.runTestCommand();
+    await app.generateReport();
+  }
+  catch (err) {
+    log(err);
+  }
+
+})();
 
 
 

lib/app.js

@@ -170,34 +170,18 @@ class App {
    *  Changes here should be also be added to the before() block of test/run.js).
    *  @return {Promise} Resolves when testrpc prints 'Listening' to std out / norpc is true.
    */
-  launchTestrpc() {
-    return new Promise((resolve, reject) => {
-      if (!this.norpc) {
-        const defaultRpcOptions = `--accounts ${this.accounts} --port ${this.port}`;
-        const options = (this.testrpcOptions || defaultRpcOptions) + ` --gasLimit ${gasLimitHex}`;
-        const command = './node_modules/ganache-cli/build/cli.node.js ';
-
-        // Launch
-        const execOpts = {maxBuffer: 1024 * 1024 * 10};
-        this.testrpcProcess = childprocess.exec(command + options, execOpts, (err, stdout, stderr) => {
-          if (err) {
-            if (stdout) this.log(`testRpc stdout:\n${stdout}`);
-            if (stderr) this.log(`testRpc stderr:\n${stderr}`);
-            this.cleanUp('testRpc errored after launching as a childprocess.');
+  async launchTestrpc() {
+    if (this.norpc) {
+      return Promise.resolve();
           }
-        });
+    let truffleConfig = reqCwd.silent(`${this.workingDir}/truffle.js`);
+    let networkOpts = truffleConfig.networks.coverage;
 
-        // Resolve when testrpc logs that it's listening.
-        this.testrpcProcess.stdout.on('data', data => {
-          if (data.includes('Listening')) {
-            this.log(`Launched testrpc on port ${this.port}`);
-            return resolve();
-          }
-        });
-      } else {
-        return resolve();
-      }
-    });
+    let ganache = require("ganache-cli");
+    let server = ganache.server(networkOpts);
+
+    let { promisify } = require('util');
+    await promisify(server.listen)(networkOpts.port);
   }
 
   /**
@@ -206,7 +190,26 @@ class App {
    *  as its own statement for command line options to work, apparently.
    *  Also reads the 'allFiredEvents' log.
    */
-  runTestCommand() {
+  async runTestCommand() {
+    
+    let testCommand = require("truffle-core/lib/commands/test");
+    let options = { logger: console, network: 'coverage', _: [] };
+
+    shell.cd(this.coverageDir);
+
+    await new Promise((resolve, reject) => {
+      testCommand.run(options, (err, res) => {
+        if (err) {
+          reject(err);
+        }
+        resolve(res);
+      });
+    });
+
+    shell.cd('./..');
+
+    return;
+
     try {
       const defaultCommand = `truffle test ${this.network} ${this.silence}`;
       const command = this.testCommand || defaultCommand;