Added helper function to get the list of current validators (#1713)

celo-org · Nov 15, 2019 · d0229ce · d0229ce
1 parent 1700119
commit d0229ce
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 11 deletions.
diff --git a/packages/celotool/src/e2e-tests/governance_tests.ts b/packages/celotool/src/e2e-tests/governance_tests.ts
@@ -212,17 +212,8 @@ describe('governance tests', () => {
       await sleep(epoch)
     })
 
-    const getValidatorSetAtBlock = async (blockNumber: number) => {
-      const validatorSetSize = await election.methods
-        .numberValidatorsInCurrentSet()
-        .call({}, blockNumber)
-      const validatorSet = []
-      for (let i = 0; i < validatorSetSize; i++) {
-        validatorSet.push(
-          await election.methods.validatorAddressFromCurrentSet(i).call({}, blockNumber)
-        )
-      }
-      return validatorSet
+    const getValidatorSetAtBlock = async (blockNumber: number): Promise<string[]> => {
+      return election.methods.currentValidators().call({}, blockNumber)
     }
 
     const getLastEpochBlock = (blockNumber: number) => {

diff --git a/packages/protocol/contracts/governance/Election.sol b/packages/protocol/contracts/governance/Election.sol
@@ -802,4 +802,17 @@ contract Election is
     }
     return array;
   }
+
+  /**
+   * @notice Returns get current validators using the precompile.
+   * @return List of current validators.
+   */
+  function currentValidators() public view returns (address[] memory) {
+    uint256 n = numberValidatorsInCurrentSet();
+    address[] memory res = new address[](n);
+    for (uint256 idx = 0; idx < n; idx++) {
+      res[idx] = validatorAddressFromCurrentSet(idx);
+    }
+    return res;
+  }
 }