test(contracts): cleanup contracts tests

privacy-scaling-explorations · Aug 1, 2024 · 7f8fc25 · 7f8fc25
1 parent 313b44a
commit 7f8fc25
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 155 deletions.
diff --git a/contracts/tests/EASGatekeeper.test.ts b/contracts/tests/EASGatekeeper.test.ts
@@ -35,8 +35,9 @@ describe("EAS Gatekeeper", () => {
   });
 
   describe("Deployment", () => {
-    it("The gatekeeper should be deployed correctly", () => {
+    it("The gatekeeper should be deployed correctly", async () => {
       expect(easGatekeeper).to.not.eq(undefined);
+      expect(await easGatekeeper.getAddress()).to.not.eq(ZeroAddress);
     });
 
     it("should fail to deploy when the eas contract address is not valid", async () => {

diff --git a/contracts/tests/GitcoinPassportGatekeeper.test.ts b/contracts/tests/GitcoinPassportGatekeeper.test.ts
@@ -35,8 +35,9 @@ describe("GitcoinPassport Gatekeeper", () => {
   });
 
   describe("Deployment", () => {
-    it("The gatekeeper should be deployed correctly", () => {
+    it("The gatekeeper should be deployed correctly", async () => {
       expect(gitcoinGatekeeper).to.not.eq(undefined);
+      expect(await gitcoinGatekeeper.getAddress()).to.not.eq(ZeroAddress);
     });
 
     it("should fail to deploy when the decoder contract address is not valid", async () => {

diff --git a/contracts/tests/MACI.test.ts b/contracts/tests/MACI.test.ts
@@ -1,6 +1,6 @@
 /* eslint-disable no-underscore-dangle */
 import { expect } from "chai";
-import { AbiCoder, BigNumberish, Signer } from "ethers";
+import { AbiCoder, BigNumberish, Signer, ZeroAddress } from "ethers";
 import { EthereumProvider } from "hardhat/types";
 import { MaciState } from "maci-core";
 import { NOTHING_UP_MY_SLEEVE } from "maci-crypto";
@@ -34,7 +34,6 @@ describe("MACI", function test() {
   let signer: Signer;
 
   const maciState = new MaciState(STATE_TREE_DEPTH);
-  const signUpTxOpts = { gasLimit: 400000 };
 
   describe("Deployment", () => {
     before(async () => {
@@ -80,7 +79,6 @@ describe("MACI", function test() {
           user.pubKey.asContractParam(),
           AbiCoder.defaultAbiCoder().encode(["uint256"], [1]),
           AbiCoder.defaultAbiCoder().encode(["uint256"], [0]),
-          signUpTxOpts,
         );
         // eslint-disable-next-line no-await-in-loop
         const receipt = await tx.wait();
@@ -115,7 +113,6 @@ describe("MACI", function test() {
           },
           AbiCoder.defaultAbiCoder().encode(["uint256"], [1]),
           AbiCoder.defaultAbiCoder().encode(["uint256"], [0]),
-          signUpTxOpts,
         ),
       ).to.be.revertedWithCustomError(maciContract, "InvalidPubKey");
     });
@@ -129,7 +126,6 @@ describe("MACI", function test() {
           },
           AbiCoder.defaultAbiCoder().encode(["uint256"], [1]),
           AbiCoder.defaultAbiCoder().encode(["uint256"], [0]),
-          signUpTxOpts,
         ),
       ).to.be.revertedWithCustomError(maciContract, "InvalidPubKey");
     });
@@ -143,7 +139,6 @@ describe("MACI", function test() {
           },
           AbiCoder.defaultAbiCoder().encode(["uint256"], [1]),
           AbiCoder.defaultAbiCoder().encode(["uint256"], [0]),
-          signUpTxOpts,
         ),
       ).to.be.revertedWithCustomError(maciContract, "InvalidPubKey");
     });
@@ -157,7 +152,6 @@ describe("MACI", function test() {
           },
           AbiCoder.defaultAbiCoder().encode(["uint256"], [1]),
           AbiCoder.defaultAbiCoder().encode(["uint256"], [0]),
-          signUpTxOpts,
         ),
       ).to.be.revertedWithCustomError(maciContract, "InvalidPubKey");
     });
@@ -223,20 +217,14 @@ describe("MACI", function test() {
         verifierContract,
         vkRegistryContract,
         EMode.QV,
-        { gasLimit: 10000000 },
       );
       const receipt = await tx.wait();
 
       const block = await signer.provider!.getBlock(receipt!.blockHash);
       deployTime = block!.timestamp;
 
       expect(receipt?.status).to.eq(1);
-      const iface = maciContract.interface;
-      const logs = receipt!.logs[receipt!.logs.length - 1];
-      const event = iface.parseLog(logs as unknown as { topics: string[]; data: string }) as unknown as {
-        args: { _pollId: bigint };
-      };
-      pollId = event.args._pollId;
+      pollId = (await maciContract.nextPollId()) - 1n;
 
       const p = maciState.deployPoll(
         BigInt(deployTime + duration),
@@ -268,7 +256,6 @@ describe("MACI", function test() {
         verifierContract,
         vkRegistryContract,
         EMode.QV,
-        { gasLimit: 10000000 },
       );
       const receipt = await tx.wait();
       expect(receipt?.status).to.eq(1);
@@ -286,7 +273,6 @@ describe("MACI", function test() {
           verifierContract,
           vkRegistryContract,
           EMode.QV,
-          { gasLimit: 10000000 },
         );
       const receipt = await tx.wait();
       expect(receipt?.status).to.eq(1);
@@ -305,9 +291,7 @@ describe("MACI", function test() {
     it("should allow a Poll contract to merge the state tree (calculate the state root)", async () => {
       await timeTravel(signer.provider as unknown as EthereumProvider, Number(duration) + 1);
 
-      const tx = await pollContract.mergeMaciState({
-        gasLimit: 3000000,
-      });
+      const tx = await pollContract.mergeMaciState();
       const receipt = await tx.wait();
       expect(receipt?.status).to.eq(1);
     });
@@ -327,7 +311,6 @@ describe("MACI", function test() {
         users[0].pubKey.asContractParam(),
         AbiCoder.defaultAbiCoder().encode(["uint256"], [1]),
         AbiCoder.defaultAbiCoder().encode(["uint256"], [0]),
-        signUpTxOpts,
       );
       const receipt = await tx.wait();
       expect(receipt?.status).to.eq(1);
@@ -353,8 +336,11 @@ describe("MACI", function test() {
   });
 
   describe("getPoll", () => {
-    it("should return an address for a valid id", async () => {
-      expect(await maciContract.getPoll(pollId)).to.not.eq(0);
+    it("should return an object for a valid id", async () => {
+      const pollContracts = await maciContract.getPoll(pollId);
+      expect(pollContracts.poll).to.not.eq(ZeroAddress);
+      expect(pollContracts.messageProcessor).to.not.eq(ZeroAddress);
+      expect(pollContracts.tally).to.not.eq(ZeroAddress);
     });
 
     it("should throw when given an invalid poll id", async () => {

diff --git a/contracts/tests/MessageProcessor.test.ts b/contracts/tests/MessageProcessor.test.ts
@@ -68,32 +68,18 @@ describe("MessageProcessor", () => {
       verifierContract,
       vkRegistryContract,
       EMode.QV,
-      {
-        gasLimit: 10000000,
-      },
     );
     let receipt = await tx.wait();
 
     // extract poll id
     expect(receipt?.status).to.eq(1);
-    const iface = maciContract.interface;
-    const logs = receipt!.logs[receipt!.logs.length - 1];
-    const event = iface.parseLog(logs as unknown as { topics: string[]; data: string }) as unknown as {
-      args: {
-        _pollId: bigint;
-        pollAddr: {
-          poll: string;
-          messageProcessor: string;
-          tally: string;
-        };
-      };
-    };
-    pollId = event.args._pollId;
+
+    pollId = (await maciContract.nextPollId()) - 1n;
 
     const pollContracts = await maciContract.getPoll(pollId);
     pollContract = PollFactory.connect(pollContracts.poll, signer);
 
-    mpContract = MessageProcessorFactory.connect(event.args.pollAddr.messageProcessor, signer);
+    mpContract = MessageProcessorFactory.connect(pollContracts.messageProcessor, signer);
 
     const block = await signer.provider!.getBlock(receipt!.blockHash);
     const deployTime = block!.timestamp;
@@ -132,7 +118,6 @@ describe("MessageProcessor", () => {
       EMode.QV,
       testProcessVk.asContractParam() as IVerifyingKeyStruct,
       testTallyVk.asContractParam() as IVerifyingKeyStruct,
-      { gasLimit: 1000000 },
     );
     receipt = await tx.wait();
     expect(receipt?.status).to.eq(1);

diff --git a/contracts/tests/Poll.test.ts b/contracts/tests/Poll.test.ts
@@ -59,22 +59,15 @@ describe("Poll", () => {
         verifierContract,
         vkRegistryContract,
         EMode.QV,
-        {
-          gasLimit: 10000000,
-        },
       );
       const receipt = await tx.wait();
 
       const block = await signer.provider!.getBlock(receipt!.blockHash);
       deployTime = block!.timestamp;
 
       expect(receipt?.status).to.eq(1);
-      const iface = maciContract.interface;
-      const logs = receipt!.logs[receipt!.logs.length - 1];
-      const event = iface.parseLog(logs as unknown as { topics: string[]; data: string }) as unknown as {
-        args: { _pollId: bigint };
-      };
-      pollId = event.args._pollId;
+
+      pollId = (await maciContract.nextPollId()) - 1n;
 
       const pollContracts = await maciContract.getPoll(pollId);
       pollContract = PollFactory.connect(pollContracts.poll, signer);
@@ -154,9 +147,6 @@ describe("Poll", () => {
           r.mockVerifierContract as Verifier,
           r.vkRegistryContract,
           EMode.QV,
-          {
-            gasLimit: 10000000,
-          },
         ),
       ).to.be.revertedWithCustomError(testMaciContract, "InvalidPubKey");
     });
@@ -275,13 +265,11 @@ describe("Poll", () => {
     });
 
     it("should allow to merge the message AccQueue", async () => {
-      let tx = await pollContract.mergeMessageAqSubRoots(0, {
-        gasLimit: 3000000,
-      });
+      let tx = await pollContract.mergeMessageAqSubRoots(0);
       let receipt = await tx.wait();
       expect(receipt?.status).to.eq(1);
 
-      tx = await pollContract.mergeMessageAq({ gasLimit: 4000000 });
+      tx = await pollContract.mergeMessageAq();
       receipt = await tx.wait();
       expect(receipt?.status).to.eq(1);
     });

diff --git a/contracts/tests/Tally.test.ts b/contracts/tests/Tally.test.ts
@@ -79,37 +79,20 @@ describe("TallyVotes", () => {
       verifierContract,
       vkRegistryContract,
       EMode.QV,
-      {
-        gasLimit: 10000000,
-      },
     );
     const receipt = await tx.wait();
 
     const block = await signer.provider!.getBlock(receipt!.blockHash);
     const deployTime = block!.timestamp;
 
     expect(receipt?.status).to.eq(1);
-    const iface = maciContract.interface;
-    const logs = receipt!.logs[receipt!.logs.length - 1];
-    const event = iface.parseLog(logs as unknown as { topics: string[]; data: string }) as unknown as {
-      args: {
-        _pollId: bigint;
-        pollAddr: {
-          poll: string;
-          messageProcessor: string;
-          tally: string;
-        };
-      };
-      name: string;
-    };
-    expect(event.name).to.eq("DeployPoll");
-
-    pollId = event.args._pollId;
+
+    pollId = (await maciContract.nextPollId()) - 1n;
 
     const pollContracts = await maciContract.getPoll(pollId);
     pollContract = PollFactory.connect(pollContracts.poll, signer);
-    mpContract = MessageProcessorFactory.connect(event.args.pollAddr.messageProcessor, signer);
-    tallyContract = TallyFactory.connect(event.args.pollAddr.tally, signer);
+    mpContract = MessageProcessorFactory.connect(pollContracts.messageProcessor, signer);
+    tallyContract = TallyFactory.connect(pollContracts.tally, signer);
 
     // deploy local poll
     const p = maciState.deployPoll(BigInt(deployTime + duration), maxValues, treeDepths, messageBatchSize, coordinator);
@@ -146,7 +129,6 @@ describe("TallyVotes", () => {
       EMode.QV,
       testProcessVk.asContractParam() as IVerifyingKeyStruct,
       testTallyVk.asContractParam() as IVerifyingKeyStruct,
-      { gasLimit: 1000000 },
     );
   });
 
@@ -260,37 +242,20 @@ describe("TallyVotes", () => {
         verifierContract,
         vkRegistryContract,
         EMode.QV,
-        {
-          gasLimit: 10000000,
-        },
       );
       const receipt = await tx.wait();
 
       const block = await signer.provider!.getBlock(receipt!.blockHash);
       const deployTime = block!.timestamp;
 
       expect(receipt?.status).to.eq(1);
-      const iface = maciContract.interface;
-      const logs = receipt!.logs[receipt!.logs.length - 1];
-      const event = iface.parseLog(logs as unknown as { topics: string[]; data: string }) as unknown as {
-        args: {
-          _pollId: bigint;
-          pollAddr: {
-            poll: string;
-            messageProcessor: string;
-            tally: string;
-          };
-        };
-        name: string;
-      };
-      expect(event.name).to.eq("DeployPoll");
-
-      pollId = event.args._pollId;
+
+      pollId = (await maciContract.nextPollId()) - 1n;
 
       const pollContracts = await maciContract.getPoll(pollId);
       pollContract = PollFactory.connect(pollContracts.poll, signer);
-      mpContract = MessageProcessorFactory.connect(event.args.pollAddr.messageProcessor, signer);
-      tallyContract = TallyFactory.connect(event.args.pollAddr.tally, signer);
+      mpContract = MessageProcessorFactory.connect(pollContracts.messageProcessor, signer);
+      tallyContract = TallyFactory.connect(pollContracts.tally, signer);
 
       // deploy local poll
       const p = maciState.deployPoll(
@@ -333,7 +298,6 @@ describe("TallyVotes", () => {
         EMode.QV,
         testProcessVk.asContractParam() as IVerifyingKeyStruct,
         testTallyVk.asContractParam() as IVerifyingKeyStruct,
-        { gasLimit: 1000000 },
       );
 
       await timeTravel(signer.provider! as unknown as EthereumProvider, updatedDuration);
@@ -405,37 +369,20 @@ describe("TallyVotes", () => {
         verifierContract,
         vkRegistryContract,
         EMode.QV,
-        {
-          gasLimit: 10000000,
-        },
       );
       const receipt = await tx.wait();
 
       const block = await signer.provider!.getBlock(receipt!.blockHash);
       const deployTime = block!.timestamp;
 
       expect(receipt?.status).to.eq(1);
-      const iface = maciContract.interface;
-      const logs = receipt!.logs[receipt!.logs.length - 1];
-      const event = iface.parseLog(logs as unknown as { topics: string[]; data: string }) as unknown as {
-        args: {
-          _pollId: bigint;
-          pollAddr: {
-            poll: string;
-            messageProcessor: string;
-            tally: string;
-          };
-        };
-        name: string;
-      };
-      expect(event.name).to.eq("DeployPoll");
-
-      pollId = event.args._pollId;
+
+      pollId = (await maciContract.nextPollId()) - 1n;
 
       const pollContracts = await maciContract.getPoll(pollId);
       pollContract = PollFactory.connect(pollContracts.poll, signer);
-      mpContract = MessageProcessorFactory.connect(event.args.pollAddr.messageProcessor, signer);
-      tallyContract = TallyFactory.connect(event.args.pollAddr.tally, signer);
+      mpContract = MessageProcessorFactory.connect(pollContracts.messageProcessor, signer);
+      tallyContract = TallyFactory.connect(pollContracts.tally, signer);
 
       // deploy local poll
       const p = maciState.deployPoll(
@@ -478,7 +425,6 @@ describe("TallyVotes", () => {
         EMode.QV,
         testProcessVk.asContractParam() as IVerifyingKeyStruct,
         testTallyVk.asContractParam() as IVerifyingKeyStruct,
-        { gasLimit: 1000000 },
       );
 
       await timeTravel(signer.provider! as unknown as EthereumProvider, updatedDuration);