Replace StarknetPluginError with assertion

test/general-tests/starknet-new-account/check.ts

@@ -1,8 +1,7 @@
 import { readFileSync } from "fs";
 import path from "path";
-import { StarknetPluginError } from "../../../src/starknet-plugin-error";
 import { hardhatStarknetNewAccount } from "../../utils/cli-functions";
-import { ensureEnvVar, extractAddress } from "../../utils/utils";
+import { assertEqual, ensureEnvVar, extractAddress } from "../../utils/utils";
 
 const network = ensureEnvVar("NETWORK");
 const home = ensureEnvVar("HOME");
@@ -22,9 +21,5 @@ const accountAddressFile = JSON.parse(accountFile.toString())[network].OpenZeppe
 const addressStd = parseInt(accountAddressStd, 16);
 const addressFile = parseInt(accountAddressFile, 16);
 
-// If address_one and address_two are equal then success
-if (addressStd === addressFile) {
-    console.log("Success");
-} else {
-    throw new StarknetPluginError("Addresses are not equal");
-}
+// If addressStd and addressFile are equal then success
+assertEqual(addressStd, addressFile, "Account address mismatch");

test/general-tests/starknet-verify/check.ts

@@ -1,6 +1,6 @@
-import { ensureEnvVar, exec, extractAddress } from "../../utils/utils";
-import { StarknetPluginError } from "../../../src/starknet-plugin-error";
+import { assertEqual, ensureEnvVar, exec, extractAddress } from "../../utils/utils";
 import { hardhatStarknetCompile, hardhatStarknetDeploy } from "../../utils/cli-functions";
+import axios from "axios";
 
 console.log("The starknet-verify test is too flaky so it is temporarily suspended. Make sure it's working!");
 process.exit(0);
@@ -24,10 +24,7 @@ exec(`npx hardhat starknet-verify --starknet-network ${network} --path ${mainCon
 console.log("Sleeping to allow Voyager to register the verification");
 exec("sleep 15s");
 
-const is_verified = exec(`curl "https://goerli.voyager.online/api/contract/${address}/code" | jq ".abiVerified"`);
-if (is_verified == "true") {
-    console.log("Successfully verified!");
-} else {
-    console.log("Error: Not verified!");
-    throw new StarknetPluginError("Error: Not verified!");
-}
+(async () => {
+    const { data } = await axios.get(`https://goerli.voyager.online/api/contract/${address}/code`);
+    assertEqual(data.abiVerified, "true", "Contract is not verified");
+})();

test/integrated-devnet-tests/with-stderr-to-STDERR/check.ts

@@ -1,6 +1,5 @@
 import { existsSync, readFileSync } from "fs";
-import { checkDevnetIsNotRunning, contains } from "../../utils/utils";
-import { StarknetPluginError } from "../../../src/starknet-plugin-error";
+import { assertExists, checkDevnetIsNotRunning, contains } from "../../utils/utils";
 import { hardhatStarknetCompile, hardhatStarknetTest } from "../../utils/cli-functions";
 
 (async () => {
@@ -14,14 +13,9 @@ import { hardhatStarknetCompile, hardhatStarknetTest } from "../../utils/cli-fun
     contains(execution.stderr, expectedWarning);
 
     // Checks if file logs/stderr.log exists and contains the expected warning string
-    if (existsSync("logs/stdout.log")) {
-        const stdout = readFileSync("logs/stdout.log", "utf-8");
-        if (!stdout.includes(expectedStdout)) {
-            throw new StarknetPluginError(`Expected stderr to contain ${expectedStdout}`);
-        }
-    } else {
-        throw new StarknetPluginError("Expected logs/stdout.log to exist");
-    }
+    assertExists("logs/stdout.log", "Expected logs/stdout.log to exist");
+    const stdout = readFileSync("logs/stdout.log", "utf-8");
+    contains(stdout, expectedStdout);
 
     console.log("Success");
     await checkDevnetIsNotRunning();

test/integrated-devnet-tests/with-stderr-to-file/check.ts

@@ -1,6 +1,5 @@
 import { existsSync, readFileSync } from "fs";
-import { checkDevnetIsNotRunning } from "../../utils/utils";
-import { StarknetPluginError } from "../../../src/starknet-plugin-error";
+import { assertExists, checkDevnetIsNotRunning, contains } from "../../utils/utils";
 import { hardhatStarknetCompile, hardhatStarknetTest } from "../../utils/cli-functions";
 
 (async () => {
@@ -12,19 +11,12 @@ import { hardhatStarknetCompile, hardhatStarknetTest } from "../../utils/cli-fun
 
     const output = hardhatStarknetTest("--no-compile test/integrated-devnet.test.ts".split(" "));
     // Checks if output contains the expected string from stdout
-    if (!output.includes(expectedStdout)) {
-        throw new StarknetPluginError(`Expected output to contain ${expectedStdout}`);
-    }
+    contains(output.stdout, expectedStdout);
 
     // Checks if file logs/stderr.log exists and contains the expected warning string
-    if (existsSync("logs/stderr.log")) {
-        const stderr = readFileSync("logs/stderr.log", "utf-8");
-        if (!stderr.includes(expectedWarning)) {
-            throw new StarknetPluginError(`Expected stderr to contain ${expectedWarning}`);
-        }
-    } else {
-        throw new StarknetPluginError("Expected logs/stderr.log to exist");
-    }
+    assertExists("logs/stderr.log", "Expected logs/stderr.log to exist");
+    const stderr = readFileSync("logs/stderr.log", "utf-8");
+    contains(stderr, expectedWarning);
 
     console.log("Success");
     await checkDevnetIsNotRunning();

test/recompilation-tests/hardhat-test/check.ts

@@ -1,8 +1,7 @@
 import { copyFileSync, readFileSync, appendFileSync } from "fs";
 import path from "path";
-import { StarknetPluginError } from "../../../src/starknet-plugin-error";
 import { hardhatStarknetTest } from "../../utils/cli-functions";
-import { rmrfSync } from "../../utils/utils";
+import { assertNotEqual, rmrfSync } from "../../utils/utils";
 
 const prefix = path.join(__dirname);
 const contractName = "contract_test_cache.cairo";
@@ -44,9 +43,7 @@ hardhatStarknetTest("--no-compile test/recompilation/recompilation-main-test.ts"
 // Check that the cache file was updated using diff
 const cacheContentAfter = readFileSync("cache/cairo-files-cache.json");
 const cacheContentBefore = readFileSync("cache-content-before.json");
-if (cacheContentAfter.equals(cacheContentBefore)) {
-    throw new StarknetPluginError("Cache file was not updated");
-}
+assertNotEqual(cacheContentAfter, cacheContentBefore, "Cache file was not updated.");
 
 console.log("Testing Recompilation one contract added another deleted");
 rmrfSync("contracts/contract_test_cache.cairo");