chore: integration test update

Author: Anmol-Dhiman

contracts/test/arbitration/draw.ts

@@ -137,11 +137,11 @@ describe("Draw Benchmark", async () => {
     const tx = await arbitrable["createDispute(string)"]("future of france", {
       value: arbitrationCost,
     });
-    if (tx.blockNumber === null) return;
+    if (tx.blockNumber === null) throw new Error("tx.blockNumber is null");
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);
     const [disputeId] = abiCoder.decode(["uint"], `0x${trace.returnValue}`);
     const lastBlock = await ethers.provider.getBlock(tx.blockNumber - 1);
-    if (lastBlock?.hash === null || lastBlock?.hash === undefined) return;
+    if (lastBlock?.hash === null || lastBlock?.hash === undefined) throw new Error("lastBlock is null || undefined");
     // Relayer tx
     await homeGateway
       .connect(await ethers.getSigner(relayer))
@@ -215,7 +215,7 @@ describe("Draw Benchmark", async () => {
         .withArgs(anyValue, 0, 0, 1)
         .to.emit(core, "Draw")
         .withArgs(anyValue, 0, 0, 2);
-      if (tx?.blockNumber === undefined) return;
+      if (tx?.blockNumber === undefined) throw new Error("txBlockNumber is null");
       countedDraws = await countDraws(tx.blockNumber);
       for (const [address, draws] of Object.entries(countedDraws)) {
         expect(await sortitionModule.getJurorBalance(address, PARENT_COURT)).to.deep.equal([
@@ -306,7 +306,7 @@ describe("Draw Benchmark", async () => {
       expect(await core.getRoundInfo(0, 0).then((round) => round.drawIterations)).to.equal(3);
 
       const tx = await (await drawTx).wait();
-      if (tx === null) return;
+      if (tx === null) throw new Error("tx is null");
       expect(tx)
         .to.emit(core, "Draw")
         .withArgs(anyValue, 0, 0, 0)
@@ -368,7 +368,7 @@ describe("Draw Benchmark", async () => {
       expect(await core.getRoundInfo(0, 0).then((round) => round.drawIterations)).to.equal(3);
 
       const tx = await (await drawTx).wait();
-      if (tx === null) return;
+      if (tx === null) throw new Error("tx is null");
       expect(tx)
         .to.emit(core, "Draw")
         .withArgs(anyValue, 0, 0, 0)

contracts/test/evidence/index.ts

@@ -13,7 +13,7 @@ const Party = {
 function getEmittedEvent(eventName: any, receipt: ContractTransactionReceipt): EventLog {
   const logs = receipt.logs as Array<EventLog>;
   const event = logs.find((log) => log.eventName === eventName);
-  if (event === undefined) process.exit();
+  if (event === undefined) throw new Error(`Event ${eventName} not found`);
   return event;
 }
 
@@ -139,7 +139,7 @@ describe("Home Evidence contract", async () => {
         value: minRequiredDeposit,
       }); // id: 0
       const receipt = await tx.wait();
-      if (receipt === null) return;
+      if (receipt === null) throw new Error("Receipt is null");
       const evidenceID = ethers.solidityPackedKeccak256(["uint", "string"], [1234, newEvidence]);
 
       const [_arbitrator, _externalDisputeID, _party, _evidence] = getEmittedEvent("ModeratedEvidence", receipt).args;
@@ -248,7 +248,7 @@ describe("Home Evidence contract", async () => {
         value: depositRequired, // Less is actually needed. Overpaid fees are reimbursed
       });
       let receipt = await tx.wait();
-      if (receipt === null) return;
+      if (receipt === null) throw new Error("Receipt is null");
       let [_arbitrator, _arbitrableDisputeID, _externalDisputeID, _templateId, _templateUri] = getEmittedEvent(
         "DisputeRequest",
         receipt

contracts/test/integration/index.ts

@@ -1,7 +1,7 @@
 import { anyValue } from "@nomicfoundation/hardhat-chai-matchers/withArgs";
 import { expect } from "chai";
 import { deployments, ethers, getNamedAccounts, network } from "hardhat";
-import { toBigInt, BytesLike } from "ethers";
+import { toBigInt } from "ethers";
 import {
   PNK,
   KlerosCore,
@@ -105,6 +105,7 @@ describe("Integration tests", async () => {
     const tx = await arbitrable["createDispute(string)"]("future of france", {
       value: arbitrationCost,
     });
+
     const trace = await network.provider.send("debug_traceTransaction", [tx.hash]);
     const [disputeId] = abiCoder.decode(["uint"], `0x${trace.returnValue}`); // get returned value from createDispute()
     console.log("Dispute Created with disputeId: %d", disputeId);
@@ -120,20 +121,23 @@ describe("Integration tests", async () => {
         0,
         ""
       );
-
-    const lastBlock = await ethers.provider.getBlock(tx.blockNumber ?? 0 - 1);
+    if (tx.blockNumber === null) throw new Error("tx.blockNumber is null");
+    const lastBlock = await ethers.provider.getBlock(tx.blockNumber - 1);
+    if (lastBlock === null) throw new Error("lastBlock is null");
     const disputeHash = ethers.solidityPackedKeccak256(
       ["bytes", "bytes32", "uint256", "address", "uint256", "uint256", "bytes"],
-      [ethers.toUtf8Bytes("createDispute"), lastBlock?.hash, 31337, arbitrable.target, disputeId, 2, "0x00"]
+      [ethers.toUtf8Bytes("createDispute"), lastBlock.hash, 31337, arbitrable.target, disputeId, 2, "0x00"]
     );
     console.log("dispute hash: ", disputeHash);
-
+    if (lastBlock.hash === null) {
+      process.exit();
+    }
     // Relayer tx
     const tx2 = await homeGateway
       .connect(relayer)
       ["relayCreateDispute((bytes32,uint256,address,uint256,uint256,uint256,string,uint256,bytes))"](
         {
-          foreignBlockHash: lastBlock?.hash as BytesLike,
+          foreignBlockHash: ethers.toBeHex(lastBlock.hash),
           foreignChainID: 31337,
           foreignArbitrable: arbitrable.target,
           foreignDisputeID: disputeId,
@@ -202,5 +206,5 @@ describe("Integration tests", async () => {
 });
 
 const logJurorBalance = async (result) => {
-  console.log("staked=%s, locked=%s", ethers.formatUnits(result.totalLocked), ethers.formatUnits(result.totalStaked));
+  console.log("staked=%s, locked=%s", ethers.formatUnits(result.totalStaked), ethers.formatUnits(result.totalLocked));
 };