Merge pull request #2 from vezenovm/mv/remove-old-report

fix: Remove loadOldReport and switch to use loadReports method for reference
noir-lang · Apr 5, 2024 · df05f34 · df05f34
2 parents 8658815 + 126cb5f
commit df05f34
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 28 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -388,15 +388,12 @@ function run() {
             const compareContent = fs.readFileSync(localReportPath, "utf8");
             referenceContent !== null && referenceContent !== void 0 ? referenceContent : (referenceContent = compareContent); // if no source gas reports were loaded, defaults to the current gas reports
             core.info(`Mapping reference gas reports`);
-            core.info(`Using old workspace report`);
-            const referenceReports = (0, report_1.loadOldReport)(referenceContent);
+            const referenceReports = (0, report_1.loadReports)(referenceContent);
             core.info(`Mapping compared gas reports`);
             const compareReports = (0, report_1.loadReports)(compareContent);
             core.endGroup();
             core.startGroup("Compute gas diff");
-            core.info(`reference reports len: ${referenceReports.programs.length}`);
-            core.info(`compare reports len: ${compareReports.programs[0].functions}`);
-            const diffRows = (0, report_1.computeProgramDiffs)(referenceReports.programs, compareReports.programs[0].functions);
+            const diffRows = (0, report_1.computeProgramDiffs)(referenceReports.programs[0].functions, compareReports.programs[0].functions);
             core.info(`Format markdown of ${diffRows.length} diffs`);
             const markdown = (0, program_1.formatMarkdownDiff)(header, diffRows, repository, github_1.context.sha, refCommitHash, summaryQuantile);
             core.info(`Format shell of ${diffRows.length} diffs`);
@@ -438,7 +435,7 @@ run();
 "use strict";
 
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.computeContractDiffs = exports.computeProgramDiffs = exports.computedWorkspaceDiff = exports.loadReports = exports.loadOldReport = exports.variation = void 0;
+exports.computeContractDiffs = exports.computeProgramDiffs = exports.computedWorkspaceDiff = exports.loadReports = exports.variation = void 0;
 const variation = (current, previous) => {
     const delta = current - previous;
     return {
@@ -449,10 +446,6 @@ const variation = (current, previous) => {
     };
 };
 exports.variation = variation;
-const loadOldReport = (content) => {
-    return JSON.parse(content);
-};
-exports.loadOldReport = loadOldReport;
 const loadReports = (content) => {
     return JSON.parse(content);
 };

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/index.ts b/src/index.ts
@@ -7,7 +7,7 @@ import * as core from "@actions/core";
 import { context, getOctokit } from "@actions/github";
 
 import { formatMarkdownDiff, formatShellDiff } from "./format/program";
-import { loadReports, computeProgramDiffs, loadOldReport } from "./report";
+import { loadReports, computeProgramDiffs } from "./report";
 
 // import { isSortCriteriaValid, isSortOrdersValid } from "./types";
 
@@ -107,17 +107,14 @@ async function run() {
     referenceContent ??= compareContent; // if no source gas reports were loaded, defaults to the current gas reports
 
     core.info(`Mapping reference gas reports`);
-    core.info(`Using old workspace report`);
-    const referenceReports = loadOldReport(referenceContent);
+    const referenceReports = loadReports(referenceContent);
     core.info(`Mapping compared gas reports`);
     const compareReports = loadReports(compareContent);
     core.endGroup();
 
     core.startGroup("Compute gas diff");
-    core.info(`reference reports len: ${referenceReports.programs.length}`);
-    core.info(`compare reports len: ${compareReports.programs[0].functions}`);
     const diffRows = computeProgramDiffs(
-      referenceReports.programs,
+      referenceReports.programs[0].functions,
       compareReports.programs[0].functions
     );
     core.info(`Format markdown of ${diffRows.length} diffs`);

diff --git a/src/report.ts b/src/report.ts
@@ -7,7 +7,6 @@ import {
   CircuitReport,
   WorkspaceDiffReport,
   WorkspaceReport,
-  OldWorkspaceReport,
 } from "./types";
 
 export const variation = (current: number, previous: number) => {
@@ -21,10 +20,6 @@ export const variation = (current: number, previous: number) => {
   };
 };
 
-export const loadOldReport = (content: string): OldWorkspaceReport => {
-  return JSON.parse(content);
-};
-
 export const loadReports = (content: string): WorkspaceReport => {
   return JSON.parse(content);
 };

diff --git a/src/types.ts b/src/types.ts
@@ -20,12 +20,6 @@ export interface WorkspaceReport {
   contracts: ContractReport[];
 }
 
-// Temporary workspace to get CI to pass when comparing against the old master report
-export interface OldWorkspaceReport {
-  programs: CircuitReport[];
-  contracts: ContractReport[];
-}
-
 export interface WorkspaceDiffReport {
   programs: DiffProgram[];
   contracts: ContractDiffReport[];