Print airdrop request in proper units (#5941)
* Make airdrop msg units consistent * Make sol prints prettier
This commit is contained in:
parent
ea015ccbe8
commit
76223f5ae7
|
@ -547,8 +547,9 @@ fn process_airdrop(
|
||||||
use_lamports_unit: bool,
|
use_lamports_unit: bool,
|
||||||
) -> ProcessResult {
|
) -> ProcessResult {
|
||||||
println!(
|
println!(
|
||||||
"Requesting airdrop of {:?} lamports from {}",
|
"Requesting airdrop of {} from {}",
|
||||||
lamports, drone_addr
|
build_balance_message(lamports, use_lamports_unit),
|
||||||
|
drone_addr
|
||||||
);
|
);
|
||||||
let previous_balance = match rpc_client.retry_get_balance(&config.keypair.pubkey(), 5)? {
|
let previous_balance = match rpc_client.retry_get_balance(&config.keypair.pubkey(), 5)? {
|
||||||
Some(lamports) => lamports,
|
Some(lamports) => lamports,
|
||||||
|
@ -1733,7 +1734,9 @@ fn build_balance_message(lamports: u64, use_lamports_unit: bool) -> String {
|
||||||
format!("{:?} lamport{}", lamports, ess)
|
format!("{:?} lamport{}", lamports, ess)
|
||||||
} else {
|
} else {
|
||||||
let sol = lamports_to_sol(lamports);
|
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(),
|
pubkey: config.keypair.pubkey(),
|
||||||
use_lamports_unit: false,
|
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();
|
let process_id = Pubkey::new_rand();
|
||||||
config.command = WalletCommand::Cancel(process_id);
|
config.command = WalletCommand::Cancel(process_id);
|
||||||
|
|
Loading…
Reference in New Issue