expect time to come as seconds

noir-lang · Dec 19, 2024 · 81d04cb · 81d04cb
1 parent c05e03e
commit 81d04cb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 67 deletions.
diff --git a/dist/index.js b/dist/index.js
@@ -30,18 +30,8 @@ const computeCompilationDiff = (refReports, compilationReports) => {
             if (refReports[i].artifact_name === compilationReports[i].artifact_name) {
                 const compTimeString = compilationReports[i].time;
                 const refTimeString = refReports[i].time;
-                const compTimeSegments = compTimeString.split("m");
-                const refTimeSegments = refTimeString.split("m");
-                const minutesString = compTimeSegments[0];
-                const refMinutesString = refTimeSegments[0];
-                const compMinutesValue = parseInt(minutesString);
-                const refMinutesValue = parseInt(refMinutesString);
-                const secondsString = compTimeSegments[1];
-                const compSecondsValue = parseFloat(secondsString.substring(0, secondsString.length - 1));
-                const compSeconds = compMinutesValue * 60 + compSecondsValue;
-                const refSecondsString = refTimeSegments[1];
-                const refSecondsValue = parseFloat(refSecondsString.substring(0, refSecondsString.length - 1));
-                const refSeconds = refMinutesValue * 60 + refSecondsValue;
+                const compSeconds = parseFloat(compTimeString.substring(0, compTimeString.length - 1));
+                const refSeconds = parseFloat(refTimeString.substring(0, refTimeString.length - 1));
                 const diff = Math.floor(((compSeconds - refSeconds) / refSeconds) * 100);
                 if (diff != 0) {
                     diff_column = true;
@@ -96,18 +86,8 @@ const computeExecutionDiff = (refReports, executionReports) => {
             if (refReports[i].artifact_name === executionReports[i].artifact_name) {
                 const compTimeString = executionReports[i].time;
                 const refTimeString = refReports[i].time;
-                const compTimeSegments = compTimeString.split("m");
-                const refTimeSegments = refTimeString.split("m");
-                const minutesString = compTimeSegments[0];
-                const refMinutesString = refTimeSegments[0];
-                const compMinutesValue = parseInt(minutesString);
-                const refMinutesValue = parseInt(refMinutesString);
-                const secondsString = compTimeSegments[1];
-                const compSecondsValue = parseFloat(secondsString.substring(0, secondsString.length - 1));
-                const compSeconds = compMinutesValue * 60 + compSecondsValue;
-                const refSecondsString = refTimeSegments[1];
-                const refSecondsValue = parseFloat(refSecondsString.substring(0, refSecondsString.length - 1));
-                const refSeconds = refMinutesValue * 60 + refSecondsValue;
+                const compSeconds = parseFloat(compTimeString.substring(0, compTimeString.length - 1));
+                const refSeconds = parseFloat(refTimeString.substring(0, refTimeString.length - 1));
                 const diff = Math.floor(((compSeconds - refSeconds) / refSeconds) * 100);
                 if (diff != 0) {
                     diff_column = true;

diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/compilation_report.ts b/src/compilation_report.ts
@@ -31,24 +31,9 @@ export const computeCompilationDiff = (
       if (refReports[i].artifact_name === compilationReports[i].artifact_name) {
         const compTimeString = compilationReports[i].time;
         const refTimeString = refReports[i].time;
-        const compTimeSegments = compTimeString.split("m");
-        const refTimeSegments = refTimeString.split("m");
 
-        const minutesString = compTimeSegments[0];
-        const refMinutesString = refTimeSegments[0];
-
-        const compMinutesValue = parseInt(minutesString);
-        const refMinutesValue = parseInt(refMinutesString);
-
-        const secondsString = compTimeSegments[1];
-        const compSecondsValue = parseFloat(secondsString.substring(0, secondsString.length - 1));
-        const compSeconds = compMinutesValue * 60 + compSecondsValue;
-
-        const refSecondsString = refTimeSegments[1];
-        const refSecondsValue = parseFloat(
-          refSecondsString.substring(0, refSecondsString.length - 1)
-        );
-        const refSeconds = refMinutesValue * 60 + refSecondsValue;
+        const compSeconds = parseFloat(compTimeString.substring(0, compTimeString.length - 1));
+        const refSeconds = parseFloat(refTimeString.substring(0, refTimeString.length - 1));
 
         const diff = Math.floor(((compSeconds - refSeconds) / refSeconds) * 100);
         if (diff != 0) {

diff --git a/src/execution_report.ts b/src/execution_report.ts
@@ -31,24 +31,9 @@ export const computeExecutionDiff = (
       if (refReports[i].artifact_name === executionReports[i].artifact_name) {
         const compTimeString = executionReports[i].time;
         const refTimeString = refReports[i].time;
-        const compTimeSegments = compTimeString.split("m");
-        const refTimeSegments = refTimeString.split("m");
 
-        const minutesString = compTimeSegments[0];
-        const refMinutesString = refTimeSegments[0];
-
-        const compMinutesValue = parseInt(minutesString);
-        const refMinutesValue = parseInt(refMinutesString);
-
-        const secondsString = compTimeSegments[1];
-        const compSecondsValue = parseFloat(secondsString.substring(0, secondsString.length - 1));
-        const compSeconds = compMinutesValue * 60 + compSecondsValue;
-
-        const refSecondsString = refTimeSegments[1];
-        const refSecondsValue = parseFloat(
-          refSecondsString.substring(0, refSecondsString.length - 1)
-        );
-        const refSeconds = refMinutesValue * 60 + refSecondsValue;
+        const compSeconds = parseFloat(compTimeString.substring(0, compTimeString.length - 1));
+        const refSeconds = parseFloat(refTimeString.substring(0, refTimeString.length - 1));
 
         const diff = Math.floor(((compSeconds - refSeconds) / refSeconds) * 100);
         if (diff != 0) {

diff --git a/tests/mocks/1-1-compilation-report.json b/tests/mocks/1-1-compilation-report.json
@@ -1,22 +1,22 @@
 {"compilation_reports": [ 
  {
     "artifact_name":"keccak256",
-    "time":"0m0.280s"
+    "time":"0.280s"
 
 }, 
  {
     "artifact_name":"workspace",
-    "time":"0m0.271s"
+    "time":"0.271s"
 
 }, 
  {
     "artifact_name":"regression_4709",
-    "time":"0m1.796s"
+    "time":"1.796s"
 
 }, 
  {
     "artifact_name":"ram_blowup_regression",
-    "time":"0m20.566s"
+    "time":"20.566s"
 
 }
 ]}
diff --git a/tests/mocks/1-2-compilation.md b/tests/mocks/1-2-compilation.md
@@ -1,7 +1,7 @@
 ## Compilation Sample
  | Program | Compilation Time | % |
  | --- | --- | --- |
- | keccak256 | 0m0.325s | 16% |
- | workspace | 0m0.300s | 10% |
- | regression_4709 | 0m1.842s | 2% |
- | ram_blowup_regression | 0m20.526s | -1% |
+ | keccak256 | 0m0.325s | -100% |
+ | workspace | 0m0.300s | -100% |
+ | regression_4709 | 0m1.842s | -100% |
+ | ram_blowup_regression | 0m20.526s | -100% |