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

Cli: polish transaction progress bar (#8963) (#8967)

Browse Source 
automerge
This commit is contained in:
Tyera Eulberg
2020-03-19 13:54:50 -06:00
committed by GitHub
parent 70f4c4a974
commit 93906847f9
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/src/rpc_client.rs
View File

@ -937,6 +937,15 @@ impl RpcClient {
transaction: &mut Transaction, transaction: &mut Transaction,
signer_keys: &T, signer_keys: &T,
) -> ClientResult<String> { ) -> ClientResult<String> {
let mut confirmations = 0;
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message(&format!(
"[{}/{}] Waiting for confirmations",
confirmations,
MAX_LOCKOUT_HISTORY + 1,
));
let mut send_retries = 20; let mut send_retries = 20;
let signature_str = loop { let signature_str = loop {
let mut status_retries = 15; let mut status_retries = 15;
@ -992,10 +1001,6 @@ impl RpcClient {
} }
} }
}; };
let progress_bar = new_spinner_progress_bar();
progress_bar.set_message("Confirming...");
let mut confirmations = 0;
let signature = Signature::from_str(&signature_str).map_err(|_| { let signature = Signature::from_str(&signature_str).map_err(|_| {
ClientError::from(ClientErrorKind::Custom(format!( ClientError::from(ClientErrorKind::Custom(format!(
"Returned string {} cannot be parsed as a signature", "Returned string {} cannot be parsed as a signature",
@ -1012,7 +1017,8 @@ impl RpcClient {
} }
progress_bar.set_message(&format!( progress_bar.set_message(&format!(
"[{}/{}] Waiting for confirmations", "[{}/{}] Waiting for confirmations",
confirmations, MAX_LOCKOUT_HISTORY, confirmations + 1,
MAX_LOCKOUT_HISTORY + 1,
)); ));
sleep(Duration::from_millis(500)); sleep(Duration::from_millis(500));
confirmations = self.get_num_blocks_since_signature_confirmation(&signature)?; confirmations = self.get_num_blocks_since_signature_confirmation(&signature)?;