Fix imports and updated readability (ChainSafe#4785)

maschad · Feb 22, 2023 · ad995e3 · ad995e3
1 parent f1f0e36
commit ad995e3
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/packages/validator/src/services/indices.ts b/packages/validator/src/services/indices.ts
@@ -1,7 +1,8 @@
 import {ValidatorIndex} from "@lodestar/types";
 import {Logger} from "@lodestar/utils";
 import {toHexString} from "@chainsafe/ssz";
-import {Api, ApiError, ValidatorResponse, ValidatorStatus} from "@lodestar/api";
+import {Api, ApiError} from "@lodestar/api";
+import {ValidatorStatus, ValidatorResponse} from "@lodestar/api/lib/beacon/routes/beacon/state.js";
 import {batchItems} from "../util/index.js";
 import {Metrics} from "../metrics.js";
 
@@ -127,7 +128,7 @@ function logValidatorStatuses(allValidators: Map<ValidatorStatus, ValidatorRespo
     "Validator activated": ["active"],
     "Validator pending": ["pending_initialized", "pending_queued"],
     "Validator withdrawn": ["withdrawal_done"],
-    "Validator exited": ["exit_slashed", "exit_unslashed"],
+    "Validator exited": ["exited_slashed", "exited_unslashed"],
   };
 
   const logFormatter = (message: string, validatorState: ValidatorResponse): void => {
@@ -136,17 +137,16 @@ function logValidatorStatuses(allValidators: Map<ValidatorStatus, ValidatorRespo
       index: validatorState.index,
     });
   };
-  Object.keys(loggedValidatorStates).map((key) => {
-    getValidatorStatesByStatuses(loggedValidatorStates[key], allValidators).forEach(
-      (validatorState: ValidatorResponse) => {
-        logFormatter(key, validatorState);
-      }
-    );
-  });
+
+  for (const [message, statuses] of Object.entries(loggedValidatorStates)) {
+    getValidatorStatesByStatuses(statuses, allValidators).forEach((validatorState) => {
+      logFormatter(message, validatorState);
+    });
+  }
 
   logger.info("Initialized validators", {
     total: allValidators.size,
-    active: allValidators.get("active")?.length,
+    active: allValidators.get("active")?.length ?? 0,
   });
 }
 

diff --git a/packages/validator/src/services/prepareBeaconProposer.ts b/packages/validator/src/services/prepareBeaconProposer.ts
@@ -3,8 +3,8 @@ import {Api, ApiError} from "@lodestar/api";
 import {SLOTS_PER_EPOCH} from "@lodestar/params";
 import {BeaconConfig} from "@lodestar/config";
 
-import {ProposerPreparationData} from "@lodestar/api";
-import {IClock, batchItems, LoggerVc} from "../util/index.js";
+import {ProposerPreparationData} from "@lodestar/api/lib/beacon/routes/validator.js";
+import {IClock, LoggerVc, batchItems} from "../util/index.js";
 import {Metrics} from "../metrics.js";
 import {ValidatorStore} from "./validatorStore.js";