Fix sol-cov to work with the new artifacts format

2 files changed, 30 insertions, 25 deletions

diff --git a/packages/sol-cov/src/collect_contract_data.ts b/packages/sol-cov/src/collect_contract_data.ts
index 3d8a45cec..bb20e98be 100644
--- a/packages/sol-cov/src/collect_contract_data.ts
+++ b/packages/sol-cov/src/collect_contract_data.ts
@@ -14,7 +14,9 @@ export const collectContractsData = (artifactsPath: string, sourcesPath: string,
         const sources = _.keys(artifact.sources);
         const contractName = artifact.contractName;
         // We don't compute coverage for dependencies
-        const sourceCodes = _.map(sources, (source: string) => fs.readFileSync(source).toString());
+        const sourceCodes = _.map(sources, (source: string) =>
+            fs.readFileSync(path.join(sourcesPath, source)).toString(),
+        );
         const contractData = {
             sourceCodes,
             sources,
diff --git a/packages/sol-cov/src/coverage_manager.ts b/packages/sol-cov/src/coverage_manager.ts
index 509c1cb99..e932ac081 100644
--- a/packages/sol-cov/src/coverage_manager.ts
+++ b/packages/sol-cov/src/coverage_manager.ts
@@ -29,10 +29,31 @@ import {
 import { utils } from './utils';
 
 export class CoverageManager {
+    private _sourcesPath: string;
     private _traceInfos: TraceInfo[] = [];
     private _contractsData: ContractData[] = [];
     private _getContractCodeAsync: (address: string) => Promise<string>;
-    private static _getSingleFileCoverageForTrace(
+    constructor(
+        artifactsPath: string,
+        sourcesPath: string,
+        networkId: number,
+        getContractCodeAsync: (address: string) => Promise<string>,
+    ) {
+        this._getContractCodeAsync = getContractCodeAsync;
+        this._sourcesPath = sourcesPath;
+        this._contractsData = collectContractsData(artifactsPath, this._sourcesPath, networkId);
+    }
+    public appendTraceInfo(traceInfo: TraceInfo): void {
+        this._traceInfos.push(traceInfo);
+    }
+    public async writeCoverageAsync(): Promise<void> {
+        const finalCoverage = await this._computeCoverageAsync();
+        const jsonReplacer: null = null;
+        const numberOfJsonSpaces = 4;
+        const stringifiedCoverage = JSON.stringify(finalCoverage, jsonReplacer, numberOfJsonSpaces);
+        fs.writeFileSync('coverage/coverage.json', stringifiedCoverage);
+    }
+    private _getSingleFileCoverageForTrace(
         contractData: ContractData,
         coveredPcs: number[],
         pcToSourceRange: { [programCounter: number]: SourceRange },
@@ -94,11 +115,12 @@ export class CoverageManager {
             );
             statementCoverage[modifierStatementId] = isModifierCovered;
         }
+        const absoluteFileName = path.join(this._sourcesPath, fileName);
         const partialCoverage = {
-            [contractData.sources[fileIndex]]: {
+            [absoluteFileName]: {
                 ...coverageEntriesDescription,
                 l: {}, // It's able to derive it from statement coverage
-                path: fileName,
+                path: absoluteFileName,
                 f: functionCoverage,
                 s: statementCoverage,
                 b: branchCoverage,
@@ -106,25 +128,6 @@ export class CoverageManager {
         };
         return partialCoverage;
     }
-    constructor(
-        artifactsPath: string,
-        sourcesPath: string,
-        networkId: number,
-        getContractCodeAsync: (address: string) => Promise<string>,
-    ) {
-        this._getContractCodeAsync = getContractCodeAsync;
-        this._contractsData = collectContractsData(artifactsPath, sourcesPath, networkId);
-    }
-    public appendTraceInfo(traceInfo: TraceInfo): void {
-        this._traceInfos.push(traceInfo);
-    }
-    public async writeCoverageAsync(): Promise<void> {
-        const finalCoverage = await this._computeCoverageAsync();
-        const jsonReplacer: null = null;
-        const numberOfJsonSpaces = 4;
-        const stringifiedCoverage = JSON.stringify(finalCoverage, jsonReplacer, numberOfJsonSpaces);
-        fs.writeFileSync('coverage/coverage.json', stringifiedCoverage);
-    }
     private async _computeCoverageAsync(): Promise<Coverage> {
         const collector = new Collector();
         for (const traceInfo of this._traceInfos) {
@@ -147,7 +150,7 @@ export class CoverageManager {
                     contractData.sources,
                 );
                 for (let fileIndex = 0; fileIndex < contractData.sources.length; fileIndex++) {
-                    const singleFileCoverageForTrace = CoverageManager._getSingleFileCoverageForTrace(
+                    const singleFileCoverageForTrace = this._getSingleFileCoverageForTrace(
                         contractData,
                         traceInfo.coveredPcs,
                         pcToSourceRange,
@@ -176,7 +179,7 @@ export class CoverageManager {
                     contractData.sources,
                 );
                 for (let fileIndex = 0; fileIndex < contractData.sources.length; fileIndex++) {
-                    const singleFileCoverageForTrace = CoverageManager._getSingleFileCoverageForTrace(
+                    const singleFileCoverageForTrace = this._getSingleFileCoverageForTrace(
                         contractData,
                         traceInfo.coveredPcs,
                         pcToSourceRange,