Improve missing default signer error messaging (#17486)
This commit is contained in:
parent
660d37aadf
commit
6d40d0d141
|
@ -89,13 +89,33 @@ impl CliSignerInfo {
|
||||||
.collect()
|
.collect()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#[derive(Debug)]
|
||||||
pub struct DefaultSigner {
|
pub struct DefaultSigner {
|
||||||
pub arg_name: String,
|
pub arg_name: String,
|
||||||
pub path: String,
|
pub path: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl DefaultSigner {
|
impl DefaultSigner {
|
||||||
|
pub fn new(path: String) -> Self {
|
||||||
|
Self {
|
||||||
|
arg_name: "keypair".to_string(),
|
||||||
|
path,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pub fn from_path(path: String) -> Result<Self, Box<dyn error::Error>> {
|
||||||
|
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(
|
pub fn generate_unique_signers(
|
||||||
&self,
|
&self,
|
||||||
bulk_signers: Vec<Option<Box<dyn Signer>>>,
|
bulk_signers: Vec<Option<Box<dyn Signer>>>,
|
||||||
|
@ -257,9 +277,7 @@ pub(crate) fn parse_signer_source<S: AsRef<str>>(
|
||||||
ASK_KEYWORD => Ok(SignerSource::new_legacy(SignerSourceKind::Prompt)),
|
ASK_KEYWORD => Ok(SignerSource::new_legacy(SignerSourceKind::Prompt)),
|
||||||
_ => match Pubkey::from_str(source.as_str()) {
|
_ => match Pubkey::from_str(source.as_str()) {
|
||||||
Ok(pubkey) => Ok(SignerSource::new(SignerSourceKind::Pubkey(pubkey))),
|
Ok(pubkey) => Ok(SignerSource::new(SignerSourceKind::Pubkey(pubkey))),
|
||||||
Err(_) => std::fs::metadata(source.as_str())
|
Err(_) => Ok(SignerSource::new(SignerSourceKind::Filepath(source))),
|
||||||
.map(|_| SignerSource::new(SignerSourceKind::Filepath(source)))
|
|
||||||
.map_err(|err| err.into()),
|
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -733,10 +751,6 @@ mod tests {
|
||||||
// Catchall into SignerSource::Filepath fails
|
// Catchall into SignerSource::Filepath fails
|
||||||
let junk = "sometextthatisnotapubkeyorfile".to_string();
|
let junk = "sometextthatisnotapubkeyorfile".to_string();
|
||||||
assert!(Pubkey::from_str(&junk).is_err());
|
assert!(Pubkey::from_str(&junk).is_err());
|
||||||
assert!(matches!(
|
|
||||||
parse_signer_source(&junk),
|
|
||||||
Err(SignerSourceError::IoError(_))
|
|
||||||
));
|
|
||||||
|
|
||||||
let prompt = "prompt:".to_string();
|
let prompt = "prompt:".to_string();
|
||||||
assert!(matches!(
|
assert!(matches!(
|
||||||
|
|
|
@ -2299,10 +2299,7 @@ mod tests {
|
||||||
let default_keypair_file = make_tmp_path("keypair_file");
|
let default_keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &default_keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &default_keypair_file).unwrap();
|
||||||
|
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(default_keypair_file);
|
||||||
arg_name: "keypair".to_string(),
|
|
||||||
path: default_keypair_file,
|
|
||||||
};
|
|
||||||
|
|
||||||
let signer_info = default_signer
|
let signer_info = default_signer
|
||||||
.generate_unique_signers(vec![], &matches, &mut None)
|
.generate_unique_signers(vec![], &matches, &mut None)
|
||||||
|
@ -2380,10 +2377,7 @@ mod tests {
|
||||||
let keypair_file = make_tmp_path("keypair_file");
|
let keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
||||||
let keypair = read_keypair_file(&keypair_file).unwrap();
|
let keypair = read_keypair_file(&keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(keypair_file.clone());
|
||||||
path: keypair_file.clone(),
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
// Test Airdrop Subcommand
|
// Test Airdrop Subcommand
|
||||||
let test_airdrop =
|
let test_airdrop =
|
||||||
test_commands
|
test_commands
|
||||||
|
@ -2911,10 +2905,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let default_keypair_file = make_tmp_path("keypair_file");
|
let default_keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &default_keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &default_keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(default_keypair_file.clone());
|
||||||
path: default_keypair_file.clone(),
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
//Test Transfer Subcommand, SOL
|
//Test Transfer Subcommand, SOL
|
||||||
let from_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
|
let from_keypair = keypair_from_seed(&[0u8; 32]).unwrap();
|
||||||
|
|
|
@ -2098,10 +2098,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
||||||
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(default_keypair_file);
|
||||||
path: default_keypair_file,
|
|
||||||
arg_name: String::new(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let test_cluster_version = test_commands
|
let test_cluster_version = test_commands
|
||||||
.clone()
|
.clone()
|
||||||
|
|
|
@ -173,16 +173,12 @@ pub fn parse_args<'a>(
|
||||||
matches.value_of("json_rpc_url").unwrap_or(""),
|
matches.value_of("json_rpc_url").unwrap_or(""),
|
||||||
&config.json_rpc_url,
|
&config.json_rpc_url,
|
||||||
);
|
);
|
||||||
let default_signer_arg_name = "keypair".to_string();
|
|
||||||
let (_, default_signer_path) = CliConfig::compute_keypair_path_setting(
|
let (_, default_signer_path) = CliConfig::compute_keypair_path_setting(
|
||||||
matches.value_of(&default_signer_arg_name).unwrap_or(""),
|
matches.value_of("keypair").unwrap_or(""),
|
||||||
&config.keypair_path,
|
&config.keypair_path,
|
||||||
);
|
);
|
||||||
|
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::from_path(default_signer_path.clone())?;
|
||||||
arg_name: default_signer_arg_name,
|
|
||||||
path: default_signer_path.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let CliCommandInfo {
|
let CliCommandInfo {
|
||||||
command,
|
command,
|
||||||
|
|
|
@ -596,10 +596,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
||||||
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(default_keypair_file.clone());
|
||||||
path: default_keypair_file.clone(),
|
|
||||||
arg_name: String::new(),
|
|
||||||
};
|
|
||||||
let (keypair_file, mut tmp_file) = make_tmp_file();
|
let (keypair_file, mut tmp_file) = make_tmp_file();
|
||||||
let nonce_account_keypair = Keypair::new();
|
let nonce_account_keypair = Keypair::new();
|
||||||
write_keypair(&nonce_account_keypair, tmp_file.as_file_mut()).unwrap();
|
write_keypair(&nonce_account_keypair, tmp_file.as_file_mut()).unwrap();
|
||||||
|
|
|
@ -2131,10 +2131,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let keypair_file = make_tmp_path("keypair_file");
|
let keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(keypair_file.clone());
|
||||||
path: keypair_file.clone(),
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let test_command = test_commands.clone().get_matches_from(vec![
|
let test_command = test_commands.clone().get_matches_from(vec![
|
||||||
"test",
|
"test",
|
||||||
|
@ -2342,10 +2339,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let keypair_file = make_tmp_path("keypair_file");
|
let keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(keypair_file.clone());
|
||||||
path: keypair_file.clone(),
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// defaults
|
// defaults
|
||||||
let test_command = test_commands.clone().get_matches_from(vec![
|
let test_command = test_commands.clone().get_matches_from(vec![
|
||||||
|
@ -2493,10 +2487,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let keypair_file = make_tmp_path("keypair_file");
|
let keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(keypair_file.clone());
|
||||||
path: keypair_file.clone(),
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let program_pubkey = Pubkey::new_unique();
|
let program_pubkey = Pubkey::new_unique();
|
||||||
let new_authority_pubkey = Pubkey::new_unique();
|
let new_authority_pubkey = Pubkey::new_unique();
|
||||||
|
@ -2604,10 +2595,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let keypair_file = make_tmp_path("keypair_file");
|
let keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(keypair_file.clone());
|
||||||
path: keypair_file.clone(),
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let buffer_pubkey = Pubkey::new_unique();
|
let buffer_pubkey = Pubkey::new_unique();
|
||||||
let new_authority_pubkey = Pubkey::new_unique();
|
let new_authority_pubkey = Pubkey::new_unique();
|
||||||
|
@ -2664,10 +2652,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let keypair_file = make_tmp_path("keypair_file");
|
let keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(keypair_file);
|
||||||
path: keypair_file,
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// defaults
|
// defaults
|
||||||
let buffer_pubkey = Pubkey::new_unique();
|
let buffer_pubkey = Pubkey::new_unique();
|
||||||
|
@ -2766,10 +2751,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let keypair_file = make_tmp_path("keypair_file");
|
let keypair_file = make_tmp_path("keypair_file");
|
||||||
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
write_keypair_file(&default_keypair, &keypair_file).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(keypair_file.clone());
|
||||||
path: keypair_file.clone(),
|
|
||||||
arg_name: "".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
// defaults
|
// defaults
|
||||||
let buffer_pubkey = Pubkey::new_unique();
|
let buffer_pubkey = Pubkey::new_unique();
|
||||||
|
|
|
@ -2117,10 +2117,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
||||||
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(default_keypair_file.clone());
|
||||||
path: default_keypair_file.clone(),
|
|
||||||
arg_name: String::new(),
|
|
||||||
};
|
|
||||||
let (keypair_file, mut tmp_file) = make_tmp_file();
|
let (keypair_file, mut tmp_file) = make_tmp_file();
|
||||||
let stake_account_keypair = Keypair::new();
|
let stake_account_keypair = Keypair::new();
|
||||||
write_keypair(&stake_account_keypair, tmp_file.as_file_mut()).unwrap();
|
write_keypair(&stake_account_keypair, tmp_file.as_file_mut()).unwrap();
|
||||||
|
|
|
@ -826,10 +826,7 @@ mod tests {
|
||||||
let default_keypair = Keypair::new();
|
let default_keypair = Keypair::new();
|
||||||
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
let (default_keypair_file, mut tmp_file) = make_tmp_file();
|
||||||
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
write_keypair(&default_keypair, tmp_file.as_file_mut()).unwrap();
|
||||||
let default_signer = DefaultSigner {
|
let default_signer = DefaultSigner::new(default_keypair_file.clone());
|
||||||
path: default_keypair_file.clone(),
|
|
||||||
arg_name: String::new(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let test_authorize_voter = test_commands.clone().get_matches_from(vec![
|
let test_authorize_voter = test_commands.clone().get_matches_from(vec![
|
||||||
"test",
|
"test",
|
||||||
|
|
Loading…
Reference in New Issue