clean up code

Author: fionnachan

src/getValidators.integration.test.ts

@@ -39,7 +39,7 @@ async function setValidator(validator: Address, state: boolean) {
 
 // Tests can be enabled once we run one node per integration test
 describe('successfully get validators', () => {
-  it('when disabling the same validator multiple time', async () => {
+  it('when disabling the same validator multiple times', async () => {
     const randomAccount = privateKeyToAccount(generatePrivateKey()).address;
 
     const { isAccurate: isAccurateInitially, validators: initialValidators } = await getValidators(
@@ -79,7 +79,7 @@ describe('successfully get validators', () => {
     expect(isAccurateFinal).toBeTruthy();
   });
 
-  it('when enabling the same validators multiple time', async () => {
+  it('when enabling the same validators multiple times', async () => {
     const randomAccount = privateKeyToAccount(generatePrivateKey()).address;
 
     const { isAccurate: isAccurateInitially, validators: initialValidators } = await getValidators(

src/getValidators.ts

@@ -62,22 +62,36 @@ function getValidatorsFromFunctionData<
   return args;
 }
 
-function updateAccumulator(acc: Set<Address>, input: Hex) {
-  const [validators, states] = getValidatorsFromFunctionData({
-    abi: [setValidatorV3Dot1ABI],
-    data: input,
-  });
+function iterateThroughValidatorsList(
+  acc: Set<Address>,
+  validators: Readonly<Address[]> | undefined,
+  enabled: Readonly<boolean[]> | undefined,
+) {
+  if (typeof validators === 'undefined' || typeof enabled === 'undefined') {
+    return acc;
+  }
+
+  const copy = new Set<Address>(acc);
 
   validators.forEach((validator, i) => {
-    const isAdd = states[i];
+    const isAdd = enabled[i];
     if (isAdd) {
-      acc.add(validator);
+      copy.add(validator);
     } else {
-      acc.delete(validator);
+      copy.delete(validator);
     }
   });
 
-  return acc;
+  return copy;
+}
+
+function updateAccumulator(acc: Set<Address>, input: Hex) {
+  const [validators, enabled] = getValidatorsFromFunctionData({
+    abi: [setValidatorV3Dot1ABI],
+    data: input,
+  });
+
+  return iterateThroughValidatorsList(acc, validators, enabled);
 }
 
 export type GetValidatorsParams = {
@@ -150,36 +164,16 @@ export async function getValidators<TChain extends Chain>(
     .filter((event) => event.eventName === 'ValidatorsSet')
     .reduce((acc, event) => {
       const { validators: _validators, enabled: _enabled } = event.args;
-
-      if (typeof _validators === 'undefined' || typeof _enabled === 'undefined') {
-        return acc;
-      }
-
-      const copy = new Set<Address>(acc);
-
-      for (let i = 0; i < _validators.length; i++) {
-        if (_enabled[i]) {
-          copy.add(_validators[i]);
-        } else {
-          copy.delete(_validators[i]);
-        }
-      }
-
-      return copy;
+      return iterateThroughValidatorsList(acc, _validators, _enabled);
     }, new Set<Address>());
 
-  const txs = await Promise.all([
-    ...preV3Dot1Events.map((event) =>
-      publicClient.getTransaction({
-        hash: event.transactionHash,
-      }),
-    ),
-    ...v3Dot1ValidatorsSetEvents.map((event) =>
+  const txs = await Promise.all(
+    preV3Dot1Events.map((event) =>
       publicClient.getTransaction({
         hash: event.transactionHash,
       }),
     ),
-  ]);
+  );
 
   let isAccurate = true;
   const validators = txs.reduce((acc, tx) => {
@@ -253,7 +247,7 @@ export async function getValidators<TChain extends Chain>(
         return acc;
       }
     }
-  }, new Set<Address>());
+  }, validatorsFromV3Dot1Events);
 
   return {
     isAccurate,