Generalized WhenL2

celo-org · Sep 20, 2024 · b1d194a · b1d194a
1 parent c3184cd
commit b1d194a
Show file tree

Hide file tree

Showing 3 changed files with 78 additions and 231 deletions.
diff --git a/packages/protocol/contracts/governance/Election.sol b/packages/protocol/contracts/governance/Election.sol
@@ -490,16 +490,17 @@ contract Election is
    *   method.
    * @return The list of elected validator signers.
    */
-  function electValidatorSigners() external view onlyL1 returns (address[] memory) {
+  function electValidatorSigners() external view returns (address[] memory) {
     return electNValidatorSigners(electableValidators.min, electableValidators.max);
   }
+
   /**
    * @notice Returns a list of elected validators with seats allocated to groups via the D'Hondt
    *   method.
    * @return The list of elected validators.
    */
-  function electValidatorAccounts() external view onlyL2 returns (address[] memory) {
-    return electNValidator(electableValidators.min, electableValidators.max);
+  function electValidatorAccounts() external view returns (address[] memory) {
+    return electNValidatorAccounts(electableValidators.min, electableValidators.max);
   }
 
   /**
@@ -800,20 +801,13 @@ contract Election is
   function electNValidatorSigners(
     uint256 minElectableValidators,
     uint256 maxElectableValidators
-  )
-    public
-    view
-    returns (
-      // TODO add tests this only works on L1 and L2
-      address[] memory
-    )
-  {
+  ) public view returns (address[] memory) {
     bool accounts = false;
     return
       _electNValidatorSignerOrAccount(minElectableValidators, maxElectableValidators, accounts);
   }
 
-  function electNValidator(
+  function electNValidatorAccounts(
     uint256 minElectableValidators,
     uint256 maxElectableValidators
   ) public view returns (address[] memory) {

diff --git a/packages/protocol/contracts/governance/interfaces/IElection.sol b/packages/protocol/contracts/governance/interfaces/IElection.sol
@@ -31,7 +31,7 @@ interface IElection {
   function electValidatorSigners() external view returns (address[] memory);
   function electValidatorAccounts() external view returns (address[] memory);
   function electNValidatorSigners(uint256, uint256) external view returns (address[] memory);
-  function electNValidator(uint256, uint256) external view returns (address[] memory);
+  function electNValidatorAccounts(uint256, uint256) external view returns (address[] memory);
   function getElectableValidators() external view returns (uint256, uint256);
   function getElectabilityThreshold() external view returns (uint256);
   function getNumVotesReceivable(address) external view returns (uint256);