Migrate account manager cli client to clap derive

account_manager/Cargo.toml

@@ -22,6 +22,7 @@ eth2_wallet_manager = { path = "../common/eth2_wallet_manager" }
 filesystem = { workspace = true }
 safe_arith = { workspace = true }
 sensitive_url = { workspace = true }
+serde = { workspace = true }
 serde_json = { workspace = true }
 slashing_protection = { workspace = true }
 slot_clock = { workspace = true }

account_manager/src/lib.rs

@@ -3,8 +3,10 @@ pub mod validator;
 pub mod wallet;
 
 use clap::ArgMatches;
-use clap::Command;
+use clap::Parser;
 use environment::Environment;
+use serde::Deserialize;
+use serde::Serialize;
 use types::EthSpec;
 
 pub const CMD: &str = "account_manager";
@@ -13,27 +15,31 @@ pub const VALIDATOR_DIR_FLAG: &str = "validator-dir";
 pub const VALIDATOR_DIR_FLAG_ALIAS: &str = "validators-dir";
 pub const WALLETS_DIR_FLAG: &str = "wallets-dir";
 
-pub fn cli_app() -> Command {
-    Command::new(CMD)
-        .visible_aliases(["a", "am", "account"])
-        .about("Utilities for generating and managing Ethereum 2.0 accounts.")
-        .display_order(0)
-        .subcommand(wallet::cli_app())
-        .subcommand(validator::cli_app())
+#[derive(Clone, Deserialize, Serialize, Debug, Parser)]
+#[clap(visible_aliases = &["a", "am", "account"], about = "Utilities for generating and managing Ethereum 2.0 accounts.")]
+pub struct AccountManager {
+    #[clap(subcommand)]
+    pub subcommand: AccountManagerSubcommand,
+}
+
+#[derive(Parser, Clone, Deserialize, Serialize, Debug)]
+#[clap(rename_all = "kebab-case")]
+pub enum AccountManagerSubcommand {
+    Wallet(wallet::cli::Wallet),
+    Validator(validator::cli::Validator),
 }
 
 /// Run the account manager, returning an error if the operation did not succeed.
-pub fn run<E: EthSpec>(matches: &ArgMatches, env: Environment<E>) -> Result<(), String> {
-    match matches.subcommand() {
-        Some((wallet::CMD, matches)) => wallet::cli_run(matches)?,
-        Some((validator::CMD, matches)) => validator::cli_run(matches, env)?,
-        Some((unknown, _)) => {
-            return Err(format!(
-                "{} is not a valid {} command. See --help.",
-                unknown, CMD
-            ));
+pub fn run<E: EthSpec>(
+    matches: &ArgMatches,
+    account_manager: &AccountManager,
+    env: Environment<E>,
+) -> Result<(), String> {
+    match &account_manager.subcommand {
+        AccountManagerSubcommand::Wallet(wallet_config) => wallet::cli_run(wallet_config, matches)?,
+        AccountManagerSubcommand::Validator(validator_config) => {
+            validator::cli_run(validator_config, matches, env)?
         }
-        _ => return Err("No subcommand provided, see --help for options".to_string()),
     }
 
     Ok(())