Change fix and update lib/test to correctly interface with workflow-c…

…ompile

packages/core/lib/test.js

@@ -102,12 +102,19 @@ const Test = {
     );
     testResolver.cache_on = false;
 
-    const { compilations } = await this.compileContractsWithTestFilesIfNeeded(
+    const {
+      compilations,
+      contracts
+    } = await this.compileContractsWithTestFilesIfNeeded(
       solTests,
       config,
       testResolver
     );
 
+    const collectedSourceIndexes = compilations.reduce((a, compilation) => {
+      return a.concat(compilation.sourceIndexes);
+    }, []);
+
     const testContracts = solTests.map(testFilePath => {
       return testResolver.require(testFilePath);
     });
@@ -119,13 +126,13 @@ const Test = {
     await this.defineSolidityTests(
       mocha,
       testContracts,
-      compilations.sourceIndexes,
+      collectedSourceIndexes,
       runner
     );
 
     const debuggerCompilations = Codec.Compilations.Utils.shimArtifacts(
-      compilations.contracts,
-      compilations.sourceIndexes
+      contracts,
+      collectedSourceIndexes
     );
 
     //for stack traces, we'll need to set up a light-mode debugger...
@@ -246,16 +253,11 @@ const Test = {
       }
     }
     // Compile project contracts and test contracts
-    const compilations = await Contracts.compile(compileConfig);
-    const collectedCompilations = compilations.reduce((a, compilation) => {
-      a.contracts = a.contracts.concat(compilation.contracts);
-      a.compilations = a.compilations.concat(compilation.compilations);
-      return a;
-    }, {});
+    const { contracts, compilations } = await Contracts.compile(compileConfig);
 
-    await Contracts.save(compileConfig, collectedCompilations.contracts);
+    await Contracts.save(compileConfig, contracts);
 
-    return collectedCompilations;
+    return { contracts, compilations };
   },
 
   performInitialDeploy: function (config, resolver) {