fixes 2

iotaledger · Mar 19, 2024 · 860d3ed · 860d3ed
1 parent b4f0211
commit 860d3ed
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cli/src/cli.rs b/cli/src/cli.rs
@@ -68,7 +68,7 @@ pub struct InitParameters {
     #[arg(short, long, value_name = "URL", env = "NODE_URL", default_value = DEFAULT_NODE_URL)]
     pub node_url: String,
     /// Set the BIP path. If not provided a bip path has to be provided interactively on first launch.
-    /// The expected format is: `<coin_type>/<account_index>/<address_index>/<change>`.
+    /// The expected format is: `<coin_type>/<account_index>/<change_address>/<address_index>`.
     #[arg(short, long, value_parser = parse_bip_path)]
     pub bip_path: Option<Bip44>,
     /// Set the Bech32-encoded wallet address.
@@ -412,7 +412,7 @@ pub async fn init_command(
 
     let mut alias = init_params.alias;
     if alias.is_none() {
-        if get_decision("Do you want to set an alias of the new wallet?")? {
+        if get_decision("Do you want to set an alias for the new wallet?")? {
             alias.replace(get_alias("Set wallet alias").await?);
         }
     }

diff --git a/cli/src/helper.rs b/cli/src/helper.rs
@@ -55,7 +55,7 @@ pub async fn get_alias(prompt: &str) -> Result<String, Error> {
     loop {
         let input = Input::<String>::new().with_prompt(prompt).interact_text()?;
         if input.is_empty() || !input.is_ascii() {
-            println_log_error!("Invalid input, please choose a non-empty alias consisting of ASCII characters.");
+            println_log_error!("Invalid input, please enter a valid alias (non-empty, ASCII).");
         } else {
             return Ok(input);
         }
@@ -66,7 +66,7 @@ pub async fn get_address(prompt: &str) -> Result<Bech32Address, Error> {
     loop {
         let input = Input::<String>::new().with_prompt(prompt).interact_text()?;
         if input.is_empty() || !input.is_ascii() {
-            println_log_error!("Invalid input, please choose a non-empty address consisting of ASCII characters.");
+            println_log_error!("Invalid input, please enter a valid Bech32 address.");
         } else {
             return Ok(Bech32Address::from_str(&input)?);
         }
@@ -77,9 +77,11 @@ pub async fn get_bip_path(prompt: &str) -> Result<Bip44, Error> {
     loop {
         let input = Input::<String>::new().with_prompt(prompt).interact_text()?;
         if input.is_empty() || !input.is_ascii() {
-            println_log_error!("Invalid input, please choose a non-empty address consisting of ASCII characters.");
+            println_log_error!(
+                "Invalid input, please enter a valid bip path (<coin_type>/<account_index>/<change_address>/<address_index>."
+            );
         } else {
-            return Ok(parse_bip_path(&input).expect("todo"));
+            return Ok(parse_bip_path(&input).map_err(|err| eyre!(err))?);
         }
     }
 }