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

Clarify account creation error messages in CLI (#7719)

Browse Source 
* Clarify account creation error messages in CLI

* feedback

* Fix rebase
This commit is contained in:
Justin Starry
2020-01-10 12:25:07 +08:00
committed by GitHub
parent e90a31781c
commit bcd072c5e8
4 changed files with 46 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
cli/src/nonce.rs
View File

@@ -379,12 +379,18 @@ pub fn process_create_nonce_account(
(&nonce_account_address, "nonce_account".to_string()),
)?;
if rpc_client.get_account(&nonce_account_address).is_ok() {
return Err(CliError::BadParameter(format!(
"Unable to create nonce account. Nonce account already exists: {}",
nonce_account_pubkey,
))
.into());
if let Ok(nonce_account) = rpc_client.get_account(&nonce_account_address) {
let err_msg = if nonce_account.owner == system_program::id()
&& State::<NonceState>::state(&nonce_account).is_ok()
{
format!("Nonce account {} already exists", nonce_account_address)
} else {
format!(
"Account {} already exists and is not a nonce account",
nonce_account_address
)
};
return Err(CliError::BadParameter(err_msg).into());
}
let minimum_balance = rpc_client.get_minimum_balance_for_rent_exemption(NonceState::size())?;