refactor(contracts): core contracts optimization, reflect on tests

privacy-scaling-explorations · Jan 17, 2025 · 91ec2c3 · 91ec2c3
1 parent 0bd434c
commit 91ec2c3
Show file tree

Hide file tree

Showing 12 changed files with 590 additions and 451 deletions.
diff --git a/packages/contracts/contracts/src/AdvancedChecker.sol b/packages/contracts/contracts/src/AdvancedChecker.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity ^0.8.20;
 
-import {IAdvancedChecker, Check, CheckStatus} from "./interfaces/IAdvancedChecker.sol";
+import {IAdvancedChecker, Check} from "./interfaces/IAdvancedChecker.sol";
 import {Checker} from "./Checker.sol";
 
 /// @title AdvancedChecker.

diff --git a/packages/contracts/contracts/src/Checker.sol b/packages/contracts/contracts/src/Checker.sol
@@ -20,17 +20,19 @@ abstract contract Checker is IChecker {
         verifiers = _verifiers;
     }
 
-    /// @notice Retrieves the list of third-party verifiers' addresses.
-    /// @return Array of addresses for the necessary verification contracts.
-    function getVerifiers() internal view returns (address[] memory) {
-        return verifiers;
+    /// @notice Retrieves the verifier address at a specific index.
+    /// @param index The index of the verifier in the array.
+    /// @return The address of the verifier at the specified index.
+    /// @custom:throws VerifierNotFound if no address have been specified at given index.
+    function getVerifierAtIndex(uint256 index) external view returns (address) {
+        return _getVerifierAtIndex(index);
     }
 
-    /// @notice Retrieves the verifier address at a specific index.
+    /// @notice Internal implementation of verifier address retrieval at a specific index.
     /// @param index The index of the verifier in the array.
     /// @return The address of the verifier at the specified index.
     /// @custom:throws VerifierNotFound if no address have been specified at given index.
-    function getVerifierAtIndex(uint256 index) internal view returns (address) {
+    function _getVerifierAtIndex(uint256 index) internal view returns (address) {
         if (index >= verifiers.length) revert VerifierNotFound();
 
         return verifiers[index];

diff --git a/packages/contracts/contracts/src/interfaces/IChecker.sol b/packages/contracts/contracts/src/interfaces/IChecker.sol
@@ -6,4 +6,10 @@ pragma solidity ^0.8.20;
 interface IChecker {
     /// @notice Core error conditions.
     error VerifierNotFound();
+
+    /// @notice Retrieves the verifier address at a specific index.
+    /// @param index The index of the verifier in the array.
+    /// @return The address of the verifier at the specified index.
+    /// @custom:throws VerifierNotFound if no address have been specified at given index.
+    function getVerifierAtIndex(uint256 index) external view returns (address);
 }