further cleanup

Author: kanej

v-next/hardhat-ignition/src/internal/tasks/verify.ts

@@ -19,15 +19,16 @@ const verifyTask: NewTaskActionFunction<TaskVerifyArguments> = async (
   { deploymentId, force },
   hre: HardhatRuntimeEnvironment,
 ) => {
-  await internalVerifyAction(
+  await verify(
     { deploymentId, force },
     hre,
     verifyContract,
     getVerificationInformation,
   );
 };
 
-export async function internalVerifyAction(
+// Exported for testing
+export async function verify(
   { deploymentId, force }: TaskVerifyArguments,
   hre: HardhatRuntimeEnvironment,
   verifyContractFn: typeof verifyContract,

v-next/hardhat-ignition/test/tasks/verify.ts

@@ -4,15 +4,15 @@ import type { VerificationProvidersConfig } from "hardhat/types/config";
 import type { HardhatRuntimeEnvironment } from "hardhat/types/hre";
 
 import { assert } from "chai";
-import chalk from "chalk";
 import sinon from "sinon";
 
-import { internalVerifyAction } from "../../src/internal/tasks/verify.js";
+import { verify } from "../../src/internal/tasks/verify.js";
 import { useEphemeralIgnitionProject } from "../test-helpers/use-ignition-project.js";
 
-describe.only("ignition verify task", () => {
+describe("ignition verify task", () => {
   useEphemeralIgnitionProject("minimal");
 
+  // TODO: replace with disableConsole() once converted to `node:test`
   let consoleLogStub: sinon.SinonStub;
   let consoleWarnStub: sinon.SinonStub;
   let consoleErrorStub: sinon.SinonStub;
@@ -48,14 +48,15 @@ describe.only("ignition verify task", () => {
       if (args.provider !== undefined) {
         verifyCallsByProvider.push(args.provider);
       }
+
       return true;
     };
 
     const mockGetVerificationInformation = async function* () {
       yield exampleVerifyInfo;
     };
 
-    await internalVerifyAction(
+    await verify(
       { deploymentId: "test-deployment", force: false },
       this.hre,
       mockVerifyContract,
@@ -66,23 +67,6 @@ describe.only("ignition verify task", () => {
     assert.include(verifyCallsByProvider, "etherscan");
     assert.include(verifyCallsByProvider, "blockscout");
     assert.include(verifyCallsByProvider, "sourcify");
-
-    const logCalls = consoleLogStub.getCalls().map((c) => c.args[0]);
-    assert.isTrue(
-      logCalls.some((log: string) =>
-        log.includes(chalk.cyan.bold("\n=== Etherscan ===")),
-      ),
-    );
-    assert.isTrue(
-      logCalls.some((log: string) =>
-        log.includes(chalk.cyan.bold("\n=== Blockscout ===")),
-      ),
-    );
-    assert.isTrue(
-      logCalls.some((log: string) =>
-        log.includes(chalk.cyan.bold("\n=== Sourcify ===")),
-      ),
-    );
   });
 
   it("should continue verification on other providers when one fails", async function () {
@@ -94,18 +78,20 @@ describe.only("ignition verify task", () => {
     ) => {
       if (args.provider !== undefined) {
         verifyCallsByProvider.push(args.provider);
+
         if (args.provider === "blockscout") {
           throw new Error("Blockscout verification failed");
         }
       }
+
       return true;
     };
 
     const mockGetVerificationInformation = async function* () {
       yield exampleVerifyInfo;
     };
 
-    await internalVerifyAction(
+    await verify(
       { deploymentId: "test-deployment", force: false },
       this.hre,
       mockVerifyContract,
@@ -116,39 +102,33 @@ describe.only("ignition verify task", () => {
     assert.include(verifyCallsByProvider, "etherscan");
     assert.include(verifyCallsByProvider, "blockscout");
     assert.include(verifyCallsByProvider, "sourcify");
-
-    const errorCalls = consoleErrorStub.getCalls().map((c) => c.args[0]);
-    assert.isTrue(
-      errorCalls.some((err: string) =>
-        err.includes(chalk.red("Blockscout verification failed")),
-      ),
-    );
   });
 
-  it("should warn when no providers are enabled", async function () {
-    const originalConfig = this.hre.config.verify;
-    (this.hre.config.verify as any) = {
-      etherscan: { enabled: false, apiKey: "" },
-      blockscout: { enabled: false },
-      sourcify: { enabled: false },
-    };
+  it("should not verify when no providers are enabled", async function () {
+    let verifyContractCalled = false;
+
+    await verify(
+      { deploymentId: "test-deployment", force: false },
+      {
+        ...this.hre,
+        config: {
+          ...this.hre.config,
+          verify: {
+            etherscan: { enabled: false, apiKey: "" as any },
+            blockscout: { enabled: false },
+            sourcify: { enabled: false },
+          },
+        },
+      },
+      async () => {
+        verifyContractCalled = true;
+
+        return true;
+      },
+      async function* () {},
+    );
 
-    try {
-      await internalVerifyAction(
-        { deploymentId: "test-deployment", force: false },
-        this.hre,
-        async () => true,
-        async function* () {},
-      );
-
-      assert.isTrue(
-        consoleWarnStub.calledWith(
-          chalk.yellow("\n⚠️  No verification providers are enabled."),
-        ),
-      );
-    } finally {
-      this.hre.config.verify = originalConfig;
-    }
+    assert.isFalse(verifyContractCalled);
   });
 
   it("should verify multiple contracts on all enabled providers", async function () {
@@ -188,7 +168,7 @@ describe.only("ignition verify task", () => {
       };
     };
 
-    await internalVerifyAction(
+    await verify(
       { deploymentId: "test-deployment", force: false },
       this.hre,
       mockVerifyContract,
@@ -229,7 +209,7 @@ describe.only("ignition verify task", () => {
       yield exampleVerifyInfo;
     };
 
-    await internalVerifyAction(
+    await verify(
       { deploymentId: "test-deployment", force: true },
       this.hre,
       mockVerifyContract,
@@ -243,14 +223,14 @@ describe.only("ignition verify task", () => {
     );
   });
 
-  it("should skip contracts when artifacts cannot be resolved", async function () {
+  it("should not verify if contracts artifacts cannot be resolved", async function () {
     let verifyContractCalled = false;
 
     const mockGetVerificationInformation = async function* () {
       yield "contracts/Foo.sol:Foo";
     };
 
-    await internalVerifyAction(
+    await verify(
       { deploymentId: "test-deployment", force: false },
       this.hre,
       async () => {