blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Print airdrop request in proper units (#5941) 

* Make airdrop msg units consistent

* Make sol prints prettier
This commit is contained in:
Tyera Eulberg 2019-09-17 23:59:35 -06:00 committed by GitHub
parent ea015ccbe8
commit 76223f5ae7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cli/src/wallet.rs
View File

@ -547,8 +547,9 @@ fn process_airdrop(
use_lamports_unit: bool,
) -> ProcessResult {
println!(
"Requesting airdrop of {:?} lamports from {}",
lamports, drone_addr
"Requesting airdrop of {} from {}",
build_balance_message(lamports, use_lamports_unit),
drone_addr
);
let previous_balance = match rpc_client.retry_get_balance(&config.keypair.pubkey(), 5)? {
Some(lamports) => lamports,
@ -1733,7 +1734,9 @@ fn build_balance_message(lamports: u64, use_lamports_unit: bool) -> String {
format!("{:?} lamport{}", lamports, ess)
} else {
let sol = lamports_to_sol(lamports);
format!("{:.8} SOL", sol)
let sol_str = format!("{:.8}", sol);
let pretty_sol = sol_str.trim_end_matches('0').trim_end_matches('.');
format!("{} SOL", pretty_sol)
}
}
@ -2814,7 +2817,7 @@ mod tests {
pubkey: config.keypair.pubkey(),
use_lamports_unit: false,
};
assert_eq!(process_command(&config).unwrap(), "0.00000000 SOL");
assert_eq!(process_command(&config).unwrap(), "0 SOL");
let process_id = Pubkey::new_rand();
config.command = WalletCommand::Cancel(process_id);