Merge branch 'development' into v2-prototype

1 files changed, 13 insertions, 14 deletions

diff --git a/packages/sol-cov/src/collect_contract_data.ts b/packages/sol-cov/src/collect_contract_data.ts
index 1d8bc7178..2c2a12835 100644
--- a/packages/sol-cov/src/collect_contract_data.ts
+++ b/packages/sol-cov/src/collect_contract_data.ts
@@ -5,28 +5,27 @@ import * as path from 'path';
 
 import { ContractData } from './types';
 
-export const collectContractsData = (artifactsPath: string, sourcesPath: string, networkId: number) => {
+export const collectContractsData = (artifactsPath: string, sourcesPath: string) => {
     const artifactsGlob = `${artifactsPath}/**/*.json`;
     const artifactFileNames = glob.sync(artifactsGlob, { absolute: true });
-    const contractsDataIfExists: Array<ContractData | {}> = _.map(artifactFileNames, artifactFileName => {
+    const contractsData: ContractData[] = [];
+    _.forEach(artifactFileNames, artifactFileName => {
         const artifact = JSON.parse(fs.readFileSync(artifactFileName).toString());
-        const sources = artifact.networks[networkId].sources;
-        const contractName = artifact.contract_name;
+        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());
-        if (_.isUndefined(artifact.networks[networkId])) {
-            throw new Error(`No ${contractName} artifacts found for networkId ${networkId}`);
-        }
+        const sourceCodes = _.map(sources, (source: string) =>
+            fs.readFileSync(path.join(sourcesPath, source)).toString(),
+        );
         const contractData = {
             sourceCodes,
             sources,
-            sourceMap: artifact.networks[networkId].source_map,
-            sourceMapRuntime: artifact.networks[networkId].source_map_runtime,
-            runtimeBytecode: artifact.networks[networkId].runtime_bytecode,
-            bytecode: artifact.networks[networkId].bytecode,
+            bytecode: artifact.compilerOutput.evm.bytecode.object,
+            sourceMap: artifact.compilerOutput.evm.bytecode.sourceMap,
+            runtimeBytecode: artifact.compilerOutput.evm.deployedBytecode.object,
+            sourceMapRuntime: artifact.compilerOutput.evm.deployedBytecode.sourceMap,
         };
-        return contractData;
+        contractsData.push(contractData);
     });
-    const contractsData = _.filter(contractsDataIfExists, contractData => !_.isEmpty(contractData)) as ContractData[];
     return contractsData;
 };