Merge pull request #5966 from NomicFoundation/consent-abort

fix: propagate abort during telemetry consent enquiry
NomicFoundation · Nov 22, 2024 · fd3b0cc · fd3b0cc
2 parents 05ae2b3 + 334a6b7
commit fd3b0cc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/v-next/hardhat/src/internal/cli/prompt/prompt.ts b/v-next/hardhat/src/internal/cli/prompt/prompt.ts
@@ -35,13 +35,6 @@ export async function confirmationPromptWithTimeout(
     }
 
     return result;
-  } catch (e) {
-    if (e === "") {
-      // If the user cancels the prompt, we quit
-      return undefined;
-    }
-
-    throw e;
   } finally {
     // We can always clear the timeout, even if not set, this API is safe to
     // call with invalid values.

diff --git a/v-next/hardhat/src/internal/cli/telemetry/telemetry-permissions.ts b/v-next/hardhat/src/internal/cli/telemetry/telemetry-permissions.ts
@@ -109,10 +109,17 @@ async function getTelemetryConsent(telemetryConsentFilePath?: string) {
 
   if (await exists(telemetryConsentFilePath)) {
     // Telemetry consent was already provided, hence return the answer
-    return (await readJsonFile<TelemetryConsent>(telemetryConsentFilePath))
-      .consent;
+    const consent = (
+      await readJsonFile<TelemetryConsent>(telemetryConsentFilePath)
+    ).consent;
+
+    log(`Telemetry consent value: ${consent}`);
+
+    return consent;
   }
 
+  log("No telemetry consent file found");
+
   return undefined;
 }