update tests

Signed-off-by: John Titor <[email protected]>

Author: JohnRTitor

test/security/SecurityTests.test.ts

@@ -446,7 +446,7 @@ describe("Security Tests", function () {
         electionDatabase.write.vote([0n, candidate1.account.address], {
           account: voter1.account,
         })
-      ).to.be.rejectedWith("ElectionDatabase__ElectionClosed");
+      ).to.be.rejectedWith("ElectionDatabase__ElectionNotActive");
 
       // Open the election
       await electionDatabase.write.adminOpenElection([0n]);
@@ -461,14 +461,14 @@ describe("Security Tests", function () {
       await publicClient.waitForTransactionReceipt({ hash: voteHash });
 
       // Close the election
-      await electionDatabase.write.adminCloseElection([0n]);
+      await electionDatabase.write.adminCompleteElection([0n]);
 
       // Try to vote after election is closed
       await expect(
         electionDatabase.write.vote([0n, candidate1.account.address], {
           account: voter1.account, // Using another voter account
         })
-      ).to.be.rejectedWith("ElectionDatabase__ElectionClosed");
+      ).to.be.rejectedWith("ElectionDatabase__ElectionNotActive");
     });
 
     it("should prevent unregistered voters from voting", async function () {

test/unit/ElectionDatabase.test.ts

@@ -3,7 +3,7 @@ import { assert, expect } from "chai";
 import hre from "hardhat";
 import { getAddress } from "viem";
 import { hardhat } from "viem/chains";
-import { GenderEnum } from "../../types";
+import { GenderEnum, ElectionStatusEnum } from "../../types";
 import { getDobEpochFromAge } from "../../lib/utils";
 
 describe("ElectionDatabase Unit Tests", function () {
@@ -445,7 +445,7 @@ describe("ElectionDatabase Unit Tests", function () {
           electionDatabase.write.enrollCandidate([0n], {
             account: candidate1.account,
           })
-        ).to.be.rejectedWith("ElectionDatabase__ElectionActive");
+        ).to.be.rejectedWith("ElectionDatabase__ElectionNotNew");
       });
 
       it("should revert if candidate not registered in CandidateDatabase", async function () {
@@ -553,7 +553,7 @@ describe("ElectionDatabase Unit Tests", function () {
           electionDatabase.write.withdrawCandidate([0n], {
             account: candidate1.account,
           })
-        ).to.be.rejectedWith("ElectionDatabase__ElectionActive");
+        ).to.be.rejectedWith("ElectionDatabase__ElectionNotNew");
       });
 
       it("should revert if candidate not enrolled", async function () {
@@ -768,13 +768,13 @@ describe("ElectionDatabase Unit Tests", function () {
         );
 
         // Verify election status
-        const isActive = await electionDatabase.read.getElectionStatus([0n]);
-        assert.equal(isActive, true);
+        const status = await electionDatabase.read.getElectionStatus([0n]);
+        assert.equal(status, ElectionStatusEnum.ACTIVE);
       });
     });
 
-    describe("adminCloseElection", function () {
-      it("should emit ElectionClosed on success", async function () {
+    describe("adminCompleteElection", function () {
+      it("should emit ElectionCompleted on success", async function () {
         const { electionDatabase, candidate1, owner, publicClient } =
           await loadFixture(deployElectionDatabaseFixture);
 
@@ -794,11 +794,11 @@ describe("ElectionDatabase Unit Tests", function () {
         const hash3 = await electionDatabase.write.adminOpenElection([0n]);
         await publicClient.waitForTransactionReceipt({ hash: hash3 });
 
-        // Close election
-        const hash4 = await electionDatabase.write.adminCloseElection([0n]);
+        // Complete election
+        const hash4 = await electionDatabase.write.adminCompleteElection([0n]);
         await publicClient.waitForTransactionReceipt({ hash: hash4 });
 
-        const events = await electionDatabase.getEvents.ElectionClosed();
+        const events = await electionDatabase.getEvents.ElectionCompleted();
         expect(events).to.have.lengthOf(1);
         assert.equal(events[0].args.electionId, 0n);
         assert.equal(
@@ -807,8 +807,8 @@ describe("ElectionDatabase Unit Tests", function () {
         );
 
         // Verify election status
-        const isActive = await electionDatabase.read.getElectionStatus([0n]);
-        assert.equal(isActive, false);
+        const status = await electionDatabase.read.getElectionStatus([0n]);
+        assert.equal(status, ElectionStatusEnum.COMPLETED);
       });
     });
   });
@@ -867,7 +867,7 @@ describe("ElectionDatabase Unit Tests", function () {
           electionDatabase.write.vote([0n, candidate1.account.address], {
             account: voter1.account,
           })
-        ).to.be.rejectedWith("ElectionDatabase__ElectionClosed");
+        ).to.be.rejectedWith("ElectionDatabase__ElectionNotActive");
       });
 
       it("should revert if candidate not enrolled in election", async function () {
@@ -1041,7 +1041,7 @@ describe("ElectionDatabase Unit Tests", function () {
         const details = await electionDatabase.read.getElectionDetails([0n]);
         assert.equal(details[0], "Presidential Election 2023");
         assert.equal(details[1], "National presidential election");
-        assert.equal(details[2], false); // isActive
+        assert.equal(details[2], ElectionStatusEnum.NEW); // status
         assert.equal(details[3].length, 1); // candidates array
         assert.equal(
           getAddress(details[3][0]),

types/index.ts

@@ -3,3 +3,12 @@ export const GenderEnum = {
   FEMALE: 1,
 } as const;
 export type Gender = (typeof GenderEnum)[keyof typeof GenderEnum];
+
+export const ElectionStatusEnum = {
+  NEW: 0,
+  ACTIVE: 1,
+  COMPLETED: 2,
+  ARCHIVED: 3,
+} as const;
+export type ElectionStatus =
+  (typeof ElectionStatusEnum)[keyof typeof ElectionStatusEnum];