From f8fa57973714709736f5b8d13231e82b42be1ab9 Mon Sep 17 00:00:00 2001
From: Nico Flaig <nflaig@protonmail.com>
Date: Fri, 23 Jun 2023 17:44:03 +0200
Subject: [PATCH] refactor: clean up validator import options

---
 packages/cli/src/cmds/validator/import.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/cmds/validator/import.ts b/packages/cli/src/cmds/validator/import.ts
index 75b083c95ce0..a39dfcc16f74 100644
--- a/packages/cli/src/cmds/validator/import.ts
+++ b/packages/cli/src/cmds/validator/import.ts
@@ -10,7 +10,11 @@ import {PersistedKeysBackend} from "./keymanager/persistedKeys.js";
 
 /* eslint-disable no-console */
 
-export const importCmd: CliCommand<IValidatorCliArgs, GlobalArgs> = {
+type ValidatorImportArgs = Pick<IValidatorCliArgs, "importKeystores" | "importKeystoresPassword">;
+
+const {importKeystores, importKeystoresPassword} = validatorOptions;
+
+export const importCmd: CliCommand<ValidatorImportArgs, IValidatorCliArgs & GlobalArgs> = {
   command: "import",
 
   describe:
@@ -29,12 +33,11 @@ Ethereum Foundation utility.",
   // Note: re-uses `--importKeystores` and `--importKeystoresPassword` from root validator command options
 
   options: {
-    ...validatorOptions,
-
     importKeystores: {
-      ...validatorOptions.importKeystores,
+      ...importKeystores,
       requiresArg: true,
     },
+    importKeystoresPassword,
   },
 
   handler: async (args) => {