From 76223f5ae7ec1627b386351aea5c2e2491b9ff9d Mon Sep 17 00:00:00 2001
From: Tyera Eulberg <teulberg@gmail.com>
Date: Tue, 17 Sep 2019 23:59:35 -0600
Subject: [PATCH] Print airdrop request in proper units (#5941)

* Make airdrop msg units consistent

* Make sol prints prettier
---
 cli/src/wallet.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/cli/src/wallet.rs b/cli/src/wallet.rs
index 8b51b786e3..b2aa39a9ab 100644
--- a/cli/src/wallet.rs
+++ b/cli/src/wallet.rs
@@ -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);