gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

clap-utils: Add explicit schemes for ask and file SignerSources

Browse Source
This commit is contained in:
Trent Nelson
2021-04-16 00:08:44 -06:00
committed by Trent Nelson
parent 5d1ef5d01d
commit 6444f0e57b
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
clap-utils/src/keypair.rs
View File

@ -150,6 +150,8 @@ pub(crate) fn parse_signer_source<S: AsRef<str>>(source: S) -> SignerSource {
if let Some(scheme) = uri.scheme() { if let Some(scheme) = uri.scheme() {
let scheme = scheme.as_str().to_ascii_lowercase(); let scheme = scheme.as_str().to_ascii_lowercase();
match scheme.as_str() { match scheme.as_str() {
"ask" => SignerSource::Ask,
"file" => SignerSource::Filepath(uri.path().to_string()),
"usb" => SignerSource::Usb(source.to_string()), "usb" => SignerSource::Usb(source.to_string()),
_ => SignerSource::Filepath(source.to_string()), _ => SignerSource::Filepath(source.to_string()),
} }
@ -478,5 +480,15 @@ mod tests {
assert!(Pubkey::from_str(&junk).is_err()); assert!(Pubkey::from_str(&junk).is_err());
assert!(matches!(parse_signer_source(&junk), SignerSource::Filepath(j) if j == junk)); assert!(matches!(parse_signer_source(&junk), SignerSource::Filepath(j) if j == junk));
let ask = "ask:".to_string();
assert!(matches!(parse_signer_source(&ask), SignerSource::Ask));
let path = "/absolute/path".to_string();
assert!(
matches!(parse_signer_source(&format!("file:{}", path)), SignerSource::Filepath(p) if p == path)
);
let path = "relative/path".to_string();
assert!(
matches!(parse_signer_source(&format!("file:{}", path)), SignerSource::Filepath(p) if p == path)
);
} }
} }