From 9a9f89293a1c959ce58ec39a9c62c3602110d794 Mon Sep 17 00:00:00 2001
From: Stephen Akridge <sakridge@gmail.com>
Date: Fri, 24 Aug 2018 08:38:09 -0700
Subject: [PATCH] Better error handling messages for airdrops

---
 src/bin/bench-tps.rs | 7 ++++++-
 src/wallet.rs        | 5 ++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/bin/bench-tps.rs b/src/bin/bench-tps.rs
index 30cec91088..a0d3184f77 100644
--- a/src/bin/bench-tps.rs
+++ b/src/bin/bench-tps.rs
@@ -291,7 +291,12 @@ fn airdrop_tokens(client: &mut ThinClient, leader: &NodeInfo, id: &Keypair, tx_c
             id.pubkey(),
         );
 
-        request_airdrop(&drone_addr, &id.pubkey(), airdrop_amount as u64).unwrap();
+        if let Err(e) = request_airdrop(&drone_addr, &id.pubkey(), airdrop_amount as u64) {
+            panic!(
+                "Error requesting airdrop: {:?} to addr: {:?} amount: {}",
+                e, drone_addr, airdrop_amount
+            );
+        }
 
         // TODO: return airdrop Result from Drone instead of polling the
         //       network
diff --git a/src/wallet.rs b/src/wallet.rs
index cabd760bda..bf549b7f4e 100644
--- a/src/wallet.rs
+++ b/src/wallet.rs
@@ -1,7 +1,6 @@
 use bincode::{deserialize, serialize};
 use drone::DroneRequest;
 use signature::{Pubkey, Signature};
-use std::error;
 use std::io::prelude::*;
 use std::io::{Error, ErrorKind, Write};
 use std::mem::size_of;
@@ -11,7 +10,7 @@ pub fn request_airdrop(
     drone_addr: &SocketAddr,
     id: &Pubkey,
     tokens: u64,
-) -> Result<Signature, Box<error::Error>> {
+) -> Result<Signature, Error> {
     // TODO: make this async tokio client
     let mut stream = TcpStream::connect(drone_addr)?;
     let req = DroneRequest::GetAirdrop {
@@ -19,7 +18,7 @@ pub fn request_airdrop(
         client_pubkey: *id,
     };
     let tx = serialize(&req).expect("serialize drone request");
-    stream.write_all(&tx).unwrap();
+    stream.write_all(&tx)?;
     let mut buffer = [0; size_of::<Signature>()];
     stream
         .read_exact(&mut buffer)