test: cleanup

Author: kanej

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

@@ -1,4 +1,5 @@
 import type { VerifyContractArgs } from "@nomicfoundation/hardhat-verify/verify";
+import type { VerifyResult } from "@nomicfoundation/ignition-core";
 import type { VerificationProvidersConfig } from "hardhat/types/config";
 import type { HardhatRuntimeEnvironment } from "hardhat/types/hre";
 
@@ -9,7 +10,7 @@ import sinon from "sinon";
 import { internalVerifyAction } from "../../src/internal/tasks/verify.js";
 import { useEphemeralIgnitionProject } from "../test-helpers/use-ignition-project.js";
 
-describe("ignition verify task", () => {
+describe.only("ignition verify task", () => {
   useEphemeralIgnitionProject("minimal");
 
   let consoleLogStub: sinon.SinonStub;
@@ -28,6 +29,15 @@ describe("ignition verify task", () => {
     consoleErrorStub.restore();
   });
 
+  const exampleVerifyInfo: VerifyResult = {
+    address: "0x1234567890123456789012345678901234567890",
+    constructorArgs: [],
+    libraries: {},
+    contract: "contracts/Foo.sol:Foo",
+    creationTxHash:
+      "0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
+  };
+
   it("should verify on all enabled providers", async function () {
     const verifyCallsByProvider: Array<keyof VerificationProvidersConfig> = [];
 
@@ -42,14 +52,7 @@ describe("ignition verify task", () => {
     };
 
     const mockGetVerificationInformation = async function* () {
-      yield {
-        address: "0x1234567890123456789012345678901234567890",
-        constructorArgs: [],
-        libraries: {},
-        contract: "contracts/Foo.sol:Foo",
-        creationTxHash:
-          "0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
-      };
+      yield exampleVerifyInfo;
     };
 
     await internalVerifyAction(
@@ -99,14 +102,7 @@ describe("ignition verify task", () => {
     };
 
     const mockGetVerificationInformation = async function* () {
-      yield {
-        address: "0x1234567890123456789012345678901234567890",
-        constructorArgs: [],
-        libraries: {},
-        contract: "contracts/Foo.sol:Foo",
-        creationTxHash:
-          "0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
-      };
+      yield exampleVerifyInfo;
     };
 
     await internalVerifyAction(
@@ -203,29 +199,14 @@ describe("ignition verify task", () => {
     assert.equal(verifyCalls.length, 6);
 
     // Each contract should be verified on each provider
-    for (const contract of ["contracts/Foo.sol:Foo", "contracts/Bar.sol:Bar"]) {
-      for (const provider of ["etherscan", "blockscout", "sourcify"]) {
-        assert.isTrue(
-          verifyCalls.some(
-            (c) => c.provider === provider && c.contract === contract,
-          ),
-          `Expected ${contract} to be verified on ${provider}`,
-        );
-      }
-    }
-
-    // Both contracts should have "Verifying contract" log lines
-    const logCalls = consoleLogStub.getCalls().map((c) => c.args[0]);
-    assert.isTrue(
-      logCalls.some((log: string) =>
-        log.includes('Verifying contract "contracts/Foo.sol:Foo"'),
-      ),
-    );
-    assert.isTrue(
-      logCalls.some((log: string) =>
-        log.includes('Verifying contract "contracts/Bar.sol:Bar"'),
-      ),
-    );
+    assert.deepEqual(verifyCalls, [
+      { provider: "etherscan", contract: "contracts/Foo.sol:Foo" },
+      { provider: "blockscout", contract: "contracts/Foo.sol:Foo" },
+      { provider: "sourcify", contract: "contracts/Foo.sol:Foo" },
+      { provider: "etherscan", contract: "contracts/Bar.sol:Bar" },
+      { provider: "blockscout", contract: "contracts/Bar.sol:Bar" },
+      { provider: "sourcify", contract: "contracts/Bar.sol:Bar" },
+    ]);
   });
 
   it("should pass force flag through to each provider call", async function () {
@@ -245,14 +226,7 @@ describe("ignition verify task", () => {
     };
 
     const mockGetVerificationInformation = async function* () {
-      yield {
-        address: "0x1234567890123456789012345678901234567890",
-        constructorArgs: [],
-        libraries: {},
-        contract: "contracts/Foo.sol:Foo",
-        creationTxHash:
-          "0xabcdef1234567890abcdef1234567890abcdef1234567890abcdef1234567890",
-      };
+      yield exampleVerifyInfo;
     };
 
     await internalVerifyAction(
@@ -270,24 +244,23 @@ describe("ignition verify task", () => {
   });
 
   it("should skip contracts when artifacts cannot be resolved", async function () {
+    let verifyContractCalled = false;
+
     const mockGetVerificationInformation = async function* () {
       yield "contracts/Foo.sol:Foo";
     };
 
     await internalVerifyAction(
       { deploymentId: "test-deployment", force: false },
       this.hre,
-      async () => true,
+      async () => {
+        verifyContractCalled = true;
+
+        return true;
+      },
       mockGetVerificationInformation,
     );
 
-    const logCalls = consoleLogStub.getCalls().map((c) => c.args[0]);
-    assert.isTrue(
-      logCalls.some(
-        (log: string) =>
-          log.includes("Could not resolve contract artifacts") &&
-          log.includes("contracts/Foo.sol:Foo"),
-      ),
-    );
+    assert.isFalse(verifyContractCalled);
   });
 });