From ca8c1c6c42424815adaf7befd0fa6cd71c303851 Mon Sep 17 00:00:00 2001 From: Trent Nelson Date: Thu, 27 May 2021 18:04:48 -0600 Subject: [PATCH] Revert "Improve missing default signer error messaging (#17486)" This reverts commit 6d40d0d14152a915f37b6c7265e2a637e86a9197. --- clap-utils/src/keypair.rs | 30 ++++++++---------------------- cli/src/cli.rs | 15 ++++++++++++--- cli/src/cluster_query.rs | 5 ++++- cli/src/main.rs | 8 ++++++-- cli/src/nonce.rs | 5 ++++- cli/src/program.rs | 30 ++++++++++++++++++++++++------ cli/src/stake.rs | 5 ++++- cli/src/vote.rs | 5 ++++- 8 files changed, 66 insertions(+), 37 deletions(-) diff --git a/clap-utils/src/keypair.rs b/clap-utils/src/keypair.rs index d39bca21d4..07b06af684 100644 --- a/clap-utils/src/keypair.rs +++ b/clap-utils/src/keypair.rs @@ -89,33 +89,13 @@ impl CliSignerInfo { .collect() } } -#[derive(Debug)] + pub struct DefaultSigner { pub arg_name: String, pub path: String, } impl DefaultSigner { - pub fn new(path: String) -> Self { - Self { - arg_name: "keypair".to_string(), - path, - } - } - pub fn from_path(path: String) -> Result> { - std::fs::metadata(&path) - .map_err(|_| { - std::io::Error::new( - std::io::ErrorKind::Other, - format!( - "No default signer found, run \"solana-keygen new -o {}\" to create a new one", - path - ), - ) - .into() - }) - .map(|_| Self::new(path)) - } pub fn generate_unique_signers( &self, bulk_signers: Vec>>, @@ -277,7 +257,9 @@ pub(crate) fn parse_signer_source>( ASK_KEYWORD => Ok(SignerSource::new_legacy(SignerSourceKind::Prompt)), _ => match Pubkey::from_str(source.as_str()) { Ok(pubkey) => Ok(SignerSource::new(SignerSourceKind::Pubkey(pubkey))), - Err(_) => Ok(SignerSource::new(SignerSourceKind::Filepath(source))), + Err(_) => std::fs::metadata(source.as_str()) + .map(|_| SignerSource::new(SignerSourceKind::Filepath(source))) + .map_err(|err| err.into()), }, } } @@ -751,6 +733,10 @@ mod tests { // Catchall into SignerSource::Filepath fails let junk = "sometextthatisnotapubkeyorfile".to_string(); assert!(Pubkey::from_str(&junk).is_err()); + assert!(matches!( + parse_signer_source(&junk), + Err(SignerSourceError::IoError(_)) + )); let prompt = "prompt:".to_string(); assert!(matches!( diff --git a/cli/src/cli.rs b/cli/src/cli.rs index e1092f7df5..f488940704 100644 --- a/cli/src/cli.rs +++ b/cli/src/cli.rs @@ -2299,7 +2299,10 @@ mod tests { let default_keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &default_keypair_file).unwrap(); - let default_signer = DefaultSigner::new(default_keypair_file); + let default_signer = DefaultSigner { + arg_name: "keypair".to_string(), + path: default_keypair_file, + }; let signer_info = default_signer .generate_unique_signers(vec![], &matches, &mut None) @@ -2377,7 +2380,10 @@ mod tests { let keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &keypair_file).unwrap(); let keypair = read_keypair_file(&keypair_file).unwrap(); - let default_signer = DefaultSigner::new(keypair_file.clone()); + let default_signer = DefaultSigner { + path: keypair_file.clone(), + arg_name: "".to_string(), + }; // Test Airdrop Subcommand let test_airdrop = test_commands @@ -2905,7 +2911,10 @@ mod tests { let default_keypair = Keypair::new(); let default_keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &default_keypair_file).unwrap(); - let default_signer = DefaultSigner::new(default_keypair_file.clone()); + let default_signer = DefaultSigner { + path: default_keypair_file.clone(), + arg_name: "".to_string(), + }; //Test Transfer Subcommand, SOL let from_keypair = keypair_from_seed(&[0u8; 32]).unwrap(); diff --git a/cli/src/cluster_query.rs b/cli/src/cluster_query.rs index b4874b1b21..758f789e20 100644 --- a/cli/src/cluster_query.rs +++ b/cli/src/cluster_query.rs @@ -2098,7 +2098,10 @@ mod tests { let default_keypair = Keypair::new(); let (default_keypair_file, mut tmp_file) = make_tmp_file(); write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap(); - let default_signer = DefaultSigner::new(default_keypair_file); + let default_signer = DefaultSigner { + path: default_keypair_file, + arg_name: String::new(), + }; let test_cluster_version = test_commands .clone() diff --git a/cli/src/main.rs b/cli/src/main.rs index d4b4056e21..2ceb2f4d83 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -173,12 +173,16 @@ pub fn parse_args<'a>( matches.value_of("json_rpc_url").unwrap_or(""), &config.json_rpc_url, ); + let default_signer_arg_name = "keypair".to_string(); let (_, default_signer_path) = CliConfig::compute_keypair_path_setting( - matches.value_of("keypair").unwrap_or(""), + matches.value_of(&default_signer_arg_name).unwrap_or(""), &config.keypair_path, ); - let default_signer = DefaultSigner::from_path(default_signer_path.clone())?; + let default_signer = DefaultSigner { + arg_name: default_signer_arg_name, + path: default_signer_path.clone(), + }; let CliCommandInfo { command, diff --git a/cli/src/nonce.rs b/cli/src/nonce.rs index c978dae6e0..cf56bd792e 100644 --- a/cli/src/nonce.rs +++ b/cli/src/nonce.rs @@ -596,7 +596,10 @@ mod tests { let default_keypair = Keypair::new(); let (default_keypair_file, mut tmp_file) = make_tmp_file(); write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap(); - let default_signer = DefaultSigner::new(default_keypair_file.clone()); + let default_signer = DefaultSigner { + path: default_keypair_file.clone(), + arg_name: String::new(), + }; let (keypair_file, mut tmp_file) = make_tmp_file(); let nonce_account_keypair = Keypair::new(); write_keypair(&nonce_account_keypair, tmp_file.as_file_mut()).unwrap(); diff --git a/cli/src/program.rs b/cli/src/program.rs index 3b17423aac..ad5a730907 100644 --- a/cli/src/program.rs +++ b/cli/src/program.rs @@ -2134,7 +2134,10 @@ mod tests { let default_keypair = Keypair::new(); let keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &keypair_file).unwrap(); - let default_signer = DefaultSigner::new(keypair_file.clone()); + let default_signer = DefaultSigner { + path: keypair_file.clone(), + arg_name: "".to_string(), + }; let test_command = test_commands.clone().get_matches_from(vec![ "test", @@ -2342,7 +2345,10 @@ mod tests { let default_keypair = Keypair::new(); let keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &keypair_file).unwrap(); - let default_signer = DefaultSigner::new(keypair_file.clone()); + let default_signer = DefaultSigner { + path: keypair_file.clone(), + arg_name: "".to_string(), + }; // defaults let test_command = test_commands.clone().get_matches_from(vec![ @@ -2490,7 +2496,10 @@ mod tests { let default_keypair = Keypair::new(); let keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &keypair_file).unwrap(); - let default_signer = DefaultSigner::new(keypair_file.clone()); + let default_signer = DefaultSigner { + path: keypair_file.clone(), + arg_name: "".to_string(), + }; let program_pubkey = Pubkey::new_unique(); let new_authority_pubkey = Pubkey::new_unique(); @@ -2598,7 +2607,10 @@ mod tests { let default_keypair = Keypair::new(); let keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &keypair_file).unwrap(); - let default_signer = DefaultSigner::new(keypair_file.clone()); + let default_signer = DefaultSigner { + path: keypair_file.clone(), + arg_name: "".to_string(), + }; let buffer_pubkey = Pubkey::new_unique(); let new_authority_pubkey = Pubkey::new_unique(); @@ -2655,7 +2667,10 @@ mod tests { let default_keypair = Keypair::new(); let keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &keypair_file).unwrap(); - let default_signer = DefaultSigner::new(keypair_file); + let default_signer = DefaultSigner { + path: keypair_file, + arg_name: "".to_string(), + }; // defaults let buffer_pubkey = Pubkey::new_unique(); @@ -2754,7 +2769,10 @@ mod tests { let default_keypair = Keypair::new(); let keypair_file = make_tmp_path("keypair_file"); write_keypair_file(&default_keypair, &keypair_file).unwrap(); - let default_signer = DefaultSigner::new(keypair_file.clone()); + let default_signer = DefaultSigner { + path: keypair_file.clone(), + arg_name: "".to_string(), + }; // defaults let buffer_pubkey = Pubkey::new_unique(); diff --git a/cli/src/stake.rs b/cli/src/stake.rs index f8d8c801dc..0b8566de1c 100644 --- a/cli/src/stake.rs +++ b/cli/src/stake.rs @@ -2117,7 +2117,10 @@ mod tests { let default_keypair = Keypair::new(); let (default_keypair_file, mut tmp_file) = make_tmp_file(); write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap(); - let default_signer = DefaultSigner::new(default_keypair_file.clone()); + let default_signer = DefaultSigner { + path: default_keypair_file.clone(), + arg_name: String::new(), + }; let (keypair_file, mut tmp_file) = make_tmp_file(); let stake_account_keypair = Keypair::new(); write_keypair(&stake_account_keypair, tmp_file.as_file_mut()).unwrap(); diff --git a/cli/src/vote.rs b/cli/src/vote.rs index 96e8e046e2..18ffd1f37a 100644 --- a/cli/src/vote.rs +++ b/cli/src/vote.rs @@ -826,7 +826,10 @@ mod tests { let default_keypair = Keypair::new(); let (default_keypair_file, mut tmp_file) = make_tmp_file(); write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap(); - let default_signer = DefaultSigner::new(default_keypair_file.clone()); + let default_signer = DefaultSigner { + path: default_keypair_file.clone(), + arg_name: String::new(), + }; let test_authorize_voter = test_commands.clone().get_matches_from(vec![ "test",