fix cyclomatic-complexity in solhint

iden3 · Jan 10, 2025 · f607131 · f607131
1 parent ffe4e6e
commit f607131
Showing 1 changed file with 15 additions and 8 deletions.
diff --git a/contracts/verifiers/Verifier.sol b/contracts/verifiers/Verifier.sol
@@ -245,7 +245,6 @@ abstract contract Verifier is IVerifier, ContextUpgradeable {
         // 1. Check first that groupIds don't exist and keep the number of requests per group.
         for (uint256 i = 0; i < requests.length; i++) {
             uint256 groupID = requests[i].validator.getRequestParams(requests[i].params).groupID;
-
 
             if (groupID != 0) {
                 if (groupIdExists(groupID)) {
@@ -272,13 +271,7 @@ abstract contract Verifier is IVerifier, ContextUpgradeable {
 
         // 2. Set requests checking groups and nullifierSessionID uniqueness
         for (uint256 i = 0; i < requests.length; i++) {
-            uint256 nullifierSessionID = requests[i].validator.getRequestParams(requests[i].params).nullifierSessionID;
-            if (nullifierSessionID != 0) {
-                if (s._nullifierSessionIDs[nullifierSessionID] != 0) {
-                    revert NullifierSessionIDAlreadyExists(nullifierSessionID);
-                }
-                s._nullifierSessionIDs[nullifierSessionID] = requests[i].requestId;
-            }
+            _checkNullifierSessionIdUniqueness(requests[i]);
 
             uint256 groupID = requests[i].validator.getRequestParams(requests[i].params).groupID;
 
@@ -297,6 +290,20 @@ abstract contract Verifier is IVerifier, ContextUpgradeable {
         }
     }
 
+    function _checkNullifierSessionIdUniqueness(IVerifier.Request calldata request) internal {
+        VerifierStorage storage s = _getVerifierStorage();
+        uint256 nullifierSessionID = request
+            .validator
+            .getRequestParams(request.params)
+            .nullifierSessionID;
+        if (nullifierSessionID != 0) {
+            if (s._nullifierSessionIDs[nullifierSessionID] != 0) {
+                revert NullifierSessionIDAlreadyExists(nullifierSessionID);
+            }
+            s._nullifierSessionIDs[nullifierSessionID] = request.requestId;
+        }
+    }
+
     function _getGroupIDIndex(
         uint256 groupID,
         uint256[] memory groupList,