From 06c397579858d38c39885aeade405d21abfe6be3 Mon Sep 17 00:00:00 2001
From: Andriian Chestnykh <>
Date: Tue, 30 Jan 2024 09:20:48 +0000
Subject: [PATCH] Fix tests, remove obsolete test wrapper

---
 .../test-helpers/ValidatorTestWrapper.sol     | 41 -------------------
 test/validators/v3/index.ts                   | 20 ++++-----
 .../universal-verifier.events.test.ts         |  2 +
 3 files changed, 11 insertions(+), 52 deletions(-)
 delete mode 100644 contracts/test-helpers/ValidatorTestWrapper.sol

diff --git a/contracts/test-helpers/ValidatorTestWrapper.sol b/contracts/test-helpers/ValidatorTestWrapper.sol
deleted file mode 100644
index e1e5daa8..00000000
--- a/contracts/test-helpers/ValidatorTestWrapper.sol
+++ /dev/null
@@ -1,41 +0,0 @@
-// SPDX-License-Identifier: UNLICENSED
-pragma solidity 0.8.16;
-
-import {ICircuitValidator} from "../interfaces/ICircuitValidator.sol";
-
-contract ValidatorTestWrapper {
-    ICircuitValidator public validator;
-
-    constructor(address _verifier) {
-        validator = ICircuitValidator(_verifier);
-    }
-
-    /// @return r  bool true if proof is valid
-    function verify(
-        uint256[] calldata inputs,
-        uint256[2] calldata a,
-        uint256[2][2] calldata b,
-        uint256[2] calldata c,
-        bytes calldata data
-    ) public returns (bool r) {
-        bytes4 selector = validator.verify.selector;
-        bytes memory data = abi.encodePacked(
-            selector,
-            abi.encode(inputs, a, b, c, data),
-            msg.sender
-        );
-        (bool success, bytes memory returnData) = address(validator).call(data);
-        if (!success) {
-            if (returnData.length > 0) {
-                // Extract revert reason from returnData
-                assembly {
-                    let returnDataSize := mload(returnData)
-                    revert(add(32, returnData), returnDataSize)
-                }
-            } else {
-                revert("Failed to verify proof without revert reason");
-            }
-        }
-        return success;
-    }
-}
diff --git a/test/validators/v3/index.ts b/test/validators/v3/index.ts
index 0229e628..9657c3cc 100644
--- 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
index 4d81677b..3c04bfd3 100644
--- 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,
       });
     }