Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CLI: dialoguer bump and breaking changes #1333

Merged
merged 2 commits into from
Sep 27, 2023
Merged

CLI: dialoguer bump and breaking changes #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3337ade
CLI: dialoguer bump and breaking changes
thibault-martinez Sep 26, 2023
8934fda
Merge branch '1.1' into bump-dialoguer
thibault-martinez Sep 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,9 @@ clap = { version = "4.4.4", default-features = false, features = [
"env",
] }
colored = { version = "2.0.4", default-features = false }
dialoguer = { version = "0.10.4", default-features = false, features = ["password"] }
dialoguer = { version = "0.11.0", default-features = false, features = [
"password",
] }
dotenvy = { version = "0.15.7", default-features = false }
fern-logger = { version = "0.5.0", default-features = false }
humantime = { version = "2.1.0", default-features = false }
Expand Down
3 changes: 3 additions & 0 deletions cli/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
// Copyright 2022 IOTA Stiftung
// SPDX-License-Identifier: Apache-2.0

use dialoguer::Error as DialoguerError;
use fern_logger::Error as LoggerError;
use iota_sdk::{
client::error::Error as ClientError, types::block::Error as BlockError, wallet::error::Error as WalletError,
Expand All @@ -14,6 +15,8 @@ pub enum Error {
Block(#[from] BlockError),
#[error("client error: {0}")]
Client(Box<ClientError>),
#[error("dialoguer error: {0}")]
Dialoguer(#[from] DialoguerError),
#[error("io error: {0}")]
Io(#[from] std::io::Error),
#[error("logger error: {0}")]
Expand Down
13 changes: 6 additions & 7 deletions cli/src/helper.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,12 @@ use crate::{error::Error, println_log_error, println_log_info};
const DEFAULT_MNEMONIC_FILE_PATH: &str = "./mnemonic.txt";

pub fn get_password(prompt: &str, confirmation: bool) -> Result<Password, Error> {
let mut password = dialoguer::Password::new();

password.with_prompt(prompt);
let mut password = dialoguer::Password::new().with_prompt(prompt);

if confirmation {
password.with_prompt("Provide a new Stronghold password");
password.with_confirmation("Confirm password", "Password mismatch");
password = password
.with_prompt("Provide a new Stronghold password")
.with_confirmation("Confirm password", "Password mismatch");
}

Ok(password.interact()?.into())
Expand Down Expand Up @@ -103,13 +102,13 @@ pub async fn enter_or_generate_mnemonic() -> Result<Mnemonic, Error> {
.default(0)
.interact_on(&Term::stderr())?;

let mnemnonic = match selected_choice {
let mnemonic = match selected_choice {
0 => generate_mnemonic(None, None).await?,
1 => enter_mnemonic()?,
_ => unreachable!(),
};

Ok(mnemnonic)
Ok(mnemonic)
}

pub async fn generate_mnemonic(
Expand Down
Loading