optional secret manager choice

iotaledger · Jan 16, 2024 · 467d9a6 · 467d9a6
1 parent aaa57c8
commit 467d9a6
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/cli/src/command/wallet.rs b/cli/src/command/wallet.rs
@@ -22,7 +22,6 @@ use crate::{
 };
 
 const DEFAULT_LOG_LEVEL: &str = "debug";
-const DEFAULT_SECRET_MANAGER: &str = "stronghold";
 const DEFAULT_NODE_URL: &str = "https://api.testnet.shimmer.network";
 const DEFAULT_STRONGHOLD_SNAPSHOT_PATH: &str = "./stardust-cli-wallet.stronghold";
 const DEFAULT_WALLET_DATABASE_PATH: &str = "./stardust-cli-wallet-db";
@@ -109,8 +108,8 @@ pub enum WalletCommand {
 #[derive(Debug, Clone, Args)]
 pub struct InitParameters {
     /// Set the secret manager to use.
-    #[arg(short, long, value_name = "SECRET_MANAGER", default_value = DEFAULT_SECRET_MANAGER)]
-    pub secret_manager: SecretManagerChoice,
+    #[arg(short, long, value_name = "SECRET_MANAGER")]
+    pub secret_manager: Option<SecretManagerChoice>,
     /// Set the path to the stronghold snapshot file. Ignored if the <SECRET_MANAGER> is not a Stronghold secret
     /// manager.
     #[arg(short = 't', long, value_name = "PATH", env = "STRONGHOLD_SNAPSHOT_PATH", default_value = DEFAULT_STRONGHOLD_SNAPSHOT_PATH)]
@@ -130,7 +129,7 @@ pub struct InitParameters {
 impl Default for InitParameters {
     fn default() -> Self {
         Self {
-            secret_manager: SecretManagerChoice::Stronghold,
+            secret_manager: Some(SecretManagerChoice::Stronghold),
             stronghold_snapshot_path: DEFAULT_STRONGHOLD_SNAPSHOT_PATH.to_string(),
             mnemonic_file_path: None,
             node_url: DEFAULT_NODE_URL.to_string(),

diff --git a/cli/src/helper.rs b/cli/src/helper.rs
@@ -345,7 +345,7 @@ pub async fn check_file_exists(path: &Path) -> Result<(), Error> {
     Ok(())
 }
 
-#[derive(Clone, Debug, clap::ValueEnum)]
+#[derive(Copy, Clone, Debug, clap::ValueEnum)]
 pub enum SecretManagerChoice {
     Stronghold,
     LedgerNano,

diff --git a/cli/src/wallet.rs b/cli/src/wallet.rs
@@ -322,7 +322,13 @@ async fn create_initial_account(wallet: Wallet) -> Result<(Option<Wallet>, Optio
 }
 
 async fn create_secret_manager(init_params: &InitParameters) -> Result<SecretManager, Error> {
-    Ok(match select_secret_manager().await? {
+    let choice = if let Some(choice) = &init_params.secret_manager {
+        *choice
+    } else {
+        select_secret_manager().await?
+    };
+
+    Ok(match choice {
         SecretManagerChoice::Stronghold => {
             let snapshot_path = Path::new(&init_params.stronghold_snapshot_path);