Fix linter

iden3 · Jan 29, 2024 · 566fcd1 · 566fcd1
1 parent 9aa8fe7
commit 566fcd1
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 35 deletions.
diff --git a/contracts/validators/CredentialAtomicQueryMTPValidator.sol b/contracts/validators/CredentialAtomicQueryMTPValidator.sol
@@ -92,12 +92,9 @@ contract CredentialAtomicQueryMTPValidator is CredentialAtomicQueryValidator {
         return params;
     }
 
-    function _getSpecialInputPairs(bool hasSelectiveDisclosure)
-        internal
-        pure
-        override
-        returns (ICircuitValidator.KeyInputIndexPair[] memory)
-    {
+    function _getSpecialInputPairs(
+        bool hasSelectiveDisclosure
+    ) internal pure override returns (ICircuitValidator.KeyInputIndexPair[] memory) {
         ICircuitValidator.KeyInputIndexPair[]
             memory pairs = new ICircuitValidator.KeyInputIndexPair[](2);
         pairs[0] = ICircuitValidator.KeyInputIndexPair({key: "userID", inputIndex: 1});

diff --git a/contracts/validators/CredentialAtomicQuerySigValidator.sol b/contracts/validators/CredentialAtomicQuerySigValidator.sol
@@ -92,12 +92,9 @@ contract CredentialAtomicQuerySigValidator is CredentialAtomicQueryValidator {
         return params;
     }
 
-    function _getSpecialInputPairs(bool hasSelectiveDisclosure)
-        internal
-        pure
-        override
-        returns (ICircuitValidator.KeyInputIndexPair[] memory)
-    {
+    function _getSpecialInputPairs(
+        bool hasSelectiveDisclosure
+    ) internal pure override returns (ICircuitValidator.KeyInputIndexPair[] memory) {
         ICircuitValidator.KeyInputIndexPair[]
             memory pairs = new ICircuitValidator.KeyInputIndexPair[](2);
         pairs[0] = ICircuitValidator.KeyInputIndexPair({key: "userID", inputIndex: 1});

diff --git a/contracts/validators/CredentialAtomicQueryV3Validator.sol b/contracts/validators/CredentialAtomicQueryV3Validator.sol
@@ -171,7 +171,9 @@ contract CredentialAtomicQueryV3Validator is CredentialAtomicQueryValidator {
             _checkAuth(signals.userID, sender);
         }
 
-        ICircuitValidator.KeyInputIndexPair[] memory pairs = _getSpecialInputPairs(credAtomicQuery.operator == 16);
+        ICircuitValidator.KeyInputIndexPair[] memory pairs = _getSpecialInputPairs(
+            credAtomicQuery.operator == 16
+        );
         bytes memory encodedPairs = abi.encode(pairs);
         uint256 epLength = encodedPairs.length;
 
@@ -256,12 +258,9 @@ contract CredentialAtomicQueryV3Validator is CredentialAtomicQueryValidator {
         return pubSignals;
     }
 
-    function _getSpecialInputPairs(bool hasSelectiveDisclosure)
-        internal
-        pure
-        override
-        returns (ICircuitValidator.KeyInputIndexPair[] memory)
-    {
+    function _getSpecialInputPairs(
+        bool hasSelectiveDisclosure
+    ) internal pure override returns (ICircuitValidator.KeyInputIndexPair[] memory) {
         uint256 numPairs = hasSelectiveDisclosure ? 7 : 6;
         ICircuitValidator.KeyInputIndexPair[]
             memory pairs = new ICircuitValidator.KeyInputIndexPair[](numPairs);
@@ -271,11 +270,17 @@ contract CredentialAtomicQueryV3Validator is CredentialAtomicQueryValidator {
         pairs[i++] = ICircuitValidator.KeyInputIndexPair({key: "linkID", inputIndex: 4});
         pairs[i++] = ICircuitValidator.KeyInputIndexPair({key: "nullifier", inputIndex: 5});
         if (hasSelectiveDisclosure) {
-            pairs[i++] = ICircuitValidator.KeyInputIndexPair({key: "operatorOutput", inputIndex: 6});
+            pairs[i++] = ICircuitValidator.KeyInputIndexPair({
+                key: "operatorOutput",
+                inputIndex: 6
+            });
         }
         pairs[i++] = ICircuitValidator.KeyInputIndexPair({key: "timestamp", inputIndex: 14});
         pairs[i++] = ICircuitValidator.KeyInputIndexPair({key: "verifierID", inputIndex: 15});
-        pairs[i++] = ICircuitValidator.KeyInputIndexPair({key: "nullifierSessionID", inputIndex: 16});
+        pairs[i++] = ICircuitValidator.KeyInputIndexPair({
+            key: "nullifierSessionID",
+            inputIndex: 16
+        });
 
         return pairs;
     }

diff --git a/contracts/validators/CredentialAtomicQueryValidator.sol b/contracts/validators/CredentialAtomicQueryValidator.sol
@@ -115,7 +115,7 @@ abstract contract CredentialAtomicQueryValidator is OwnableUpgradeable, ICircuit
         uint256[2] calldata c,
         bytes calldata data,
         address sender
-    ) internal view virtual returns (ICircuitValidator.KeyInputIndexPair[] memory)  {
+    ) internal view virtual returns (ICircuitValidator.KeyInputIndexPair[] memory) {
         CredentialAtomicQuery memory credAtomicQuery = abi.decode(data, (CredentialAtomicQuery));
         IVerifier verifier = _circuitIdToVerifier[credAtomicQuery.circuitIds[0]];
 
@@ -148,7 +148,9 @@ abstract contract CredentialAtomicQueryValidator is OwnableUpgradeable, ICircuit
             credAtomicQuery.skipClaimRevocationCheck
         );
 
-        ICircuitValidator.KeyInputIndexPair[] memory pairs = _getSpecialInputPairs(credAtomicQuery.operator == 16);
+        ICircuitValidator.KeyInputIndexPair[] memory pairs = _getSpecialInputPairs(
+            credAtomicQuery.operator == 16
+        );
         bytes memory encodedPairs = abi.encode(pairs);
         uint256 epLength = encodedPairs.length;
 
@@ -260,9 +262,7 @@ abstract contract CredentialAtomicQueryValidator is OwnableUpgradeable, ICircuit
         _inputNameToIndex[inputName] = ++index; // increment index to avoid 0
     }
 
-    function _getSpecialInputPairs(bool hasSelectiveDisclosure)
-        internal
-        pure
-        virtual
-        returns (ICircuitValidator.KeyInputIndexPair[] memory);
+    function _getSpecialInputPairs(
+        bool hasSelectiveDisclosure
+    ) internal pure virtual returns (ICircuitValidator.KeyInputIndexPair[] memory);
 }
diff --git a/contracts/verifiers/UniversalVerifier.sol b/contracts/verifiers/UniversalVerifier.sol
@@ -217,9 +217,11 @@ contract UniversalVerifier is OwnableUpgradeable {
         uint256[2] calldata a,
         uint256[2][2] calldata b,
         uint256[2] calldata c // TODO add bytes calldata additionalData, string calldata circuitId
-//        string calldata circuitId
-//        bytes calldata additionalData,
-    ) public requestEnabled(requestId) checkValidatorIsSet(requestId) {
+    )
+        public
+        requestEnabled(requestId)
+        checkValidatorIsSet(requestId)
+    {
         address sender = _msgSender();
         IZKPVerifier.ZKPRequestExtended memory request = _getMainStorage().requests[requestId];
 
@@ -235,7 +237,9 @@ contract UniversalVerifier is OwnableUpgradeable {
         );
 
         for (uint256 i = 0; i < pairs.length; i++) {
-            _getMainStorage().proofs[sender][requestId].storageFields[pairs[i].key] = inputs[pairs[i].inputIndex];
+            _getMainStorage().proofs[sender][requestId].storageFields[pairs[i].key] = inputs[
+                pairs[i].inputIndex
+            ];
         }
 
         _getMainStorage().proofs[msg.sender][requestId].isProved = true;
@@ -258,9 +262,7 @@ contract UniversalVerifier is OwnableUpgradeable {
         IZKPVerifier.ZKPRequestExtended memory request = _getMainStorage().requests[requestId];
 
         // TODO check with standard interface detection here!!!
-        request.validator.verifyWithSender(
-            inputs, a, b, c, request.data, _msgSender()
-        );
+        request.validator.verifyWithSender(inputs, a, b, c, request.data, _msgSender());
     }
 
     /// @notice Gets the proof storage item for a given user, request ID and key