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

cli: improve deploy resume interface (#15418)

Browse Source 
* cli: improve deploy resume interface

* add docs
This commit is contained in:
Jack May
2021-02-19 11:06:05 -08:00
committed by GitHub
parent 5d31763a3b
commit 4648439f5c
2 changed files with 39 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
cli/src/program.rs
View File

@ -122,7 +122,6 @@ impl ProgramSubCommands for App<'_, '_> {
.value_name("BUFFER_SIGNER")
.takes_value(true)
.validator(is_valid_signer)
.conflicts_with("program_location")
.help("Intermediate buffer account to write data to, which can be used to resume a failed deploy \
[default: random address]")
)
@ -695,7 +694,11 @@ fn process_program_deploy(
true
};
let (program_data, program_len) = if buffer_provided {
let (program_data, program_len) = if let Some(program_location) = program_location {
let program_data = read_and_verify_elf(&program_location)?;
let program_len = program_data.len();
(program_data, program_len)
} else if buffer_provided {
// Check supplied buffer account
if let Some(account) = rpc_client
.get_account_with_commitment(&buffer_pubkey, config.commitment)?
@ -712,10 +715,6 @@ fn process_program_deploy(
} else {
return Err("Buffer account not found, was it already consumed?".into());
}
} else if let Some(program_location) = program_location {
let program_data = read_and_verify_elf(&program_location)?;
let program_len = program_data.len();
(program_data, program_len)
} else {
return Err("Program location required if buffer not supplied".into());
};