Skip to content

Commit

Permalink
fix missing filename in 'Unable to read keypair file' errors
Browse files Browse the repository at this point in the history
  • Loading branch information
mikemaccana committed Apr 25, 2024
1 parent 81c8c55 commit 1082d2d
Showing 1 changed file with 15 additions and 12 deletions.
27 changes: 15 additions & 12 deletions cli/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,12 @@ pub enum ClusterCommand {
List,
}

fn get_keypair(path: String) -> Result<Keypair> {
let keypair = solana_sdk::signature::read_keypair_file(&path)
.map_err(|_| anyhow!("Unable to read keypair file ({})", path))?;
Ok(keypair)
}

pub fn entry(opts: Opts) -> Result<()> {
let restore_cbs = override_toolchain(&opts.cfg_override)?;
let result = process_command(opts);
Expand Down Expand Up @@ -2267,8 +2273,7 @@ fn idl_set_buffer(
priority_fee: Option<u64>,
) -> Result<Pubkey> {
with_workspace(cfg_override, |cfg| {
let keypair = solana_sdk::signature::read_keypair_file(&cfg.provider.wallet.to_string())
.map_err(|_| anyhow!("Unable to read keypair file"))?;
let keypair = get_keypair(cfg.provider.wallet.to_string())?;
let url = cluster_url(cfg, &cfg.test_validator);
let client = create_client(url);

Expand Down Expand Up @@ -2386,8 +2391,8 @@ fn idl_set_authority(
None => IdlAccount::address(&program_id),
Some(addr) => addr,
};
let keypair = solana_sdk::signature::read_keypair_file(&cfg.provider.wallet.to_string())
.map_err(|_| anyhow!("Unable to read keypair file"))?;
let keypair = get_keypair(cfg.provider.wallet.to_string())?;

let url = cluster_url(cfg, &cfg.test_validator);
let client = create_client(url);

Expand Down Expand Up @@ -2470,8 +2475,8 @@ fn idl_close_account(
print_only: bool,
priority_fee: Option<u64>,
) -> Result<()> {
let keypair = solana_sdk::signature::read_keypair_file(&cfg.provider.wallet.to_string())
.map_err(|_| anyhow!("Unable to read keypair file"))?;
let keypair = get_keypair(cfg.provider.wallet.to_string())?;

let url = cluster_url(cfg, &cfg.test_validator);
let client = create_client(url);

Expand Down Expand Up @@ -2523,8 +2528,8 @@ fn idl_write(
priority_fee: Option<u64>,
) -> Result<()> {
// Misc.
let keypair = solana_sdk::signature::read_keypair_file(&cfg.provider.wallet.to_string())
.map_err(|_| anyhow!("Unable to read keypair file"))?;
let keypair = get_keypair(cfg.provider.wallet.to_string())?;

let url = cluster_url(cfg, &cfg.test_validator);
let client = create_client(url);

Expand Down Expand Up @@ -3707,8 +3712,7 @@ fn create_idl_account(
) -> Result<Pubkey> {
// Misc.
let idl_address = IdlAccount::address(program_id);
let keypair = solana_sdk::signature::read_keypair_file(keypair_path)
.map_err(|_| anyhow!("Unable to read keypair file"))?;
let keypair = get_keypair(cfg.provider.wallet.to_string())?;
let url = cluster_url(cfg, &cfg.test_validator);
let client = create_client(url);
let idl_data = serialize_idl(idl)?;
Expand Down Expand Up @@ -3789,8 +3793,7 @@ fn create_idl_buffer(
idl: &Idl,
priority_fee: Option<u64>,
) -> Result<Pubkey> {
let keypair = solana_sdk::signature::read_keypair_file(keypair_path)
.map_err(|_| anyhow!("Unable to read keypair file"))?;
let keypair = get_keypair(cfg.provider.wallet.to_string())?;
let url = cluster_url(cfg, &cfg.test_validator);
let client = create_client(url);

Expand Down

0 comments on commit 1082d2d

Please sign in to comment.