From 23428b038198c6eaed6ccb48c567cd371c357d18 Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 20 Jul 2018 19:19:00 -0400 Subject: [PATCH] Migrate drone to poll_for_signature --- src/drone.rs | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/drone.rs b/src/drone.rs index de84cbdac4030b..f5099f46f1e126 100644 --- a/src/drone.rs +++ b/src/drone.rs @@ -298,20 +298,6 @@ mod tests { Some(150_000), ); - let bob_req = DroneRequest::GetAirdrop { - airdrop_request_amount: 50, - client_public_key: bob_pubkey, - }; - let bob_result = drone.send_airdrop(bob_req); - assert!(bob_result.is_ok()); - - let carlos_req = DroneRequest::GetAirdrop { - airdrop_request_amount: 5_000_000, - client_public_key: carlos_pubkey, - }; - let carlos_result = drone.send_airdrop(carlos_req); - assert!(carlos_result.is_ok()); - let requests_socket = UdpSocket::bind("0.0.0.0:0").expect("drone bind to requests socket"); let transactions_socket = UdpSocket::bind("0.0.0.0:0").expect("drone bind to transactions socket"); @@ -323,11 +309,25 @@ mod tests { transactions_socket, ); - let bob_balance = client.poll_get_balance(&bob_pubkey); + let bob_req = DroneRequest::GetAirdrop { + airdrop_request_amount: 50, + client_public_key: bob_pubkey, + }; + let bob_sig = drone.send_airdrop(bob_req).unwrap(); + assert!(client.poll_for_signature(&bob_sig).is_ok()); + + let carlos_req = DroneRequest::GetAirdrop { + airdrop_request_amount: 5_000_000, + client_public_key: carlos_pubkey, + }; + let carlos_sig = drone.send_airdrop(carlos_req).unwrap(); + assert!(client.poll_for_signature(&carlos_sig).is_ok()); + + let bob_balance = client.get_balance(&bob_pubkey); info!("Small request balance: {:?}", bob_balance); assert_eq!(bob_balance.unwrap(), SMALL_BATCH); - let carlos_balance = client.poll_get_balance(&carlos_pubkey); + let carlos_balance = client.get_balance(&carlos_pubkey); info!("TPS request balance: {:?}", carlos_balance); assert_eq!(carlos_balance.unwrap(), TPS_BATCH);