diff --git a/Cargo.lock b/Cargo.lock index cbaf8dbc6c96c9..7afc0a28f7f253 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7650,7 +7650,6 @@ dependencies = [ "assert_matches", "chrono", "clap 2.33.3", - "dirs-next", "rpassword", "solana-clock", "solana-cluster-type", @@ -7681,7 +7680,6 @@ dependencies = [ "assert_matches", "chrono", "clap 3.2.23", - "dirs-next", "rpassword", "solana-clock", "solana-cluster-type", diff --git a/clap-utils/Cargo.toml b/clap-utils/Cargo.toml index 29e86304ba686c..a0e9f610816e4a 100644 --- a/clap-utils/Cargo.toml +++ b/clap-utils/Cargo.toml @@ -18,7 +18,6 @@ name = "solana_clap_utils" [dependencies] chrono = { workspace = true, features = ["default"] } clap = "2.33.0" -dirs-next = { workspace = true } rpassword = { workspace = true } solana-clock = { workspace = true } solana-cluster-type = { workspace = true } diff --git a/clap-utils/src/keypair.rs b/clap-utils/src/keypair.rs index c512d587a036b9..421d1a2df2ebe7 100644 --- a/clap-utils/src/keypair.rs +++ b/clap-utils/src/keypair.rs @@ -175,16 +175,10 @@ impl DefaultSigner { } }) .map_err(|_| { - // Use the system default path in the error message instead of the configured path - let default_path = dirs_next::home_dir() - .map(|mut path| { - path.extend([".config", "solana", "id.json"]); - path.to_str().unwrap_or(&self.path).to_string() - }) - .unwrap_or_else(|| self.path.clone()); std::io::Error::other(format!( - "No default signer found, run \"solana-keygen new -o {default_path}\" to create a new \ - one" + "No default signer found, run \"solana-keygen new -o {}\" to create a new \ + one", + self.path )) })?; *self.is_path_checked.borrow_mut() = true; diff --git a/clap-v3-utils/Cargo.toml b/clap-v3-utils/Cargo.toml index 81f20d5315181b..68e6c44ba6379b 100644 --- a/clap-v3-utils/Cargo.toml +++ b/clap-v3-utils/Cargo.toml @@ -22,7 +22,6 @@ elgamal = ["dep:solana-zk-sdk"] [dependencies] chrono = { workspace = true, features = ["default"] } clap = { version = "3.2.23", features = ["cargo"] } -dirs-next = { workspace = true } rpassword = { workspace = true } solana-clock = { workspace = true } solana-cluster-type = { workspace = true } diff --git a/clap-v3-utils/src/keypair.rs b/clap-v3-utils/src/keypair.rs index e930a8c0ebce36..4022775b88ea7d 100644 --- a/clap-v3-utils/src/keypair.rs +++ b/clap-v3-utils/src/keypair.rs @@ -171,16 +171,10 @@ impl DefaultSigner { } }) .map_err(|_| { - // Use the system default path in the error message instead of the configured path - let default_path = dirs_next::home_dir() - .map(|mut path| { - path.extend([".config", "solana", "id.json"]); - path.to_str().unwrap_or(&self.path).to_string() - }) - .unwrap_or_else(|| self.path.clone()); std::io::Error::other(format!( - "No default signer found, run \"solana-keygen new -o {default_path}\" to create a new \ - one" + "No default signer found, run \"solana-keygen new -o {}\" to create a new \ + one", + self.path )) })?; *self.is_path_checked.borrow_mut() = true; diff --git a/programs/sbf/Cargo.lock b/programs/sbf/Cargo.lock index 27f5c5845b4b8a..863993620fe97f 100644 --- a/programs/sbf/Cargo.lock +++ b/programs/sbf/Cargo.lock @@ -6156,7 +6156,6 @@ version = "3.1.0" dependencies = [ "chrono", "clap", - "dirs-next", "rpassword", "solana-clock", "solana-cluster-type",