Fix tests, remove obsolete test wrapper

iden3 · Jan 30, 2024 · 06c3975 · 06c3975
1 parent 624f6f7
commit 06c3975
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 52 deletions.
diff --git a/contracts/test-helpers/ValidatorTestWrapper.sol b/contracts/test-helpers/ValidatorTestWrapper.sol
diff --git a/test/validators/v3/index.ts b/test/validators/v3/index.ts
@@ -239,7 +239,7 @@ function delay(ms: number) {
 }
 
 describe("Atomic V3 Validator", function () {
-  let state: any, v3, v3testWrapper: any, verifierWrapper: any;
+  let state: any, v3validator, verifierWrapper: any;
 
   beforeEach(async () => {
     const deployHelper = await DeployHelper.initialize(null, true);
@@ -249,10 +249,8 @@ describe("Atomic V3 Validator", function () {
       "CredentialAtomicQueryV3Validator"
     );
     state = contracts.state;
-    v3 = contracts.validator;
+    v3validator = contracts.validator;
     verifierWrapper = contracts.verifierWrapper;
-
-    v3testWrapper = await ethers.deployContract("ValidatorTestWrapper", [v3.address]);
   });
 
   for (const test of testCases) {
@@ -303,24 +301,24 @@ describe("Atomic V3 Validator", function () {
 
       const { inputs, pi_a, pi_b, pi_c } = prepareInputs(test.proofJson);
       if (test.setProofExpiration) {
-        await v3.setProofExpirationTimeout(test.setProofExpiration);
+        await v3validator.setProofExpirationTimeout(test.setProofExpiration);
       }
       if (test.setRevStateExpiration) {
-        await v3.setRevocationStateExpirationTimeout(test.setRevStateExpiration);
+        await v3validator.setRevocationStateExpirationTimeout(test.setRevStateExpiration);
       }
       if (test.setGISTRootExpiration) {
-        await v3.setGISTRootExpirationTimeout(test.setGISTRootExpiration);
+        await v3validator.setGISTRootExpirationTimeout(test.setGISTRootExpiration);
       }
       if (test.errorMessage) {
         await expect(
-          v3.verify(inputs, pi_a, pi_b, pi_c, packV3ValidatorParams(query, test.allowedIssuers))
+          v3validator.verify(inputs, pi_a, pi_b, pi_c, packV3ValidatorParams(query, test.allowedIssuers))
         ).to.be.revertedWith(test.errorMessage);
       } else if (test.errorMessage === "") {
         await expect(
-          v3.verify(inputs, pi_a, pi_b, pi_c, packV3ValidatorParams(query, test.allowedIssuers))
+          v3validator.verify(inputs, pi_a, pi_b, pi_c, packV3ValidatorParams(query, test.allowedIssuers))
         ).to.be.reverted;
       } else {
-        await v3testWrapper.verify(
+        await v3validator.verify(
           inputs,
           pi_a,
           pi_b,
@@ -332,7 +330,7 @@ describe("Atomic V3 Validator", function () {
   }
 
   it("check inputIndexOf", async () => {
-    const challengeIndx = await v3.inputIndexOf("challenge");
+    const challengeIndx = await v3validator.inputIndexOf("challenge");
     expect(challengeIndx).to.be.equal(9);
   });
 });
diff --git a/test/verifier/universal-verifier.events.test.ts b/test/verifier/universal-verifier.events.test.ts
@@ -99,6 +99,8 @@ describe("ZKP Verifier", function () {
         metadata: "metadataN" + i,
         validator: sig.address,
         data: data[i],
+        controller: signerAddress,
+        isDisabled: false,
       });
     }