From 3f38c0a245681dee4e6c93aeac2eb0beb288b238 Mon Sep 17 00:00:00 2001
From: Greg Fitzgerald <garious@gmail.com>
Date: Tue, 15 May 2018 11:19:58 -0600
Subject: [PATCH] Feed events socket into the server

---
 src/bin/testnode.rs |  3 ++-
 src/server.rs       |  1 +
 src/thin_client.rs  | 20 +++++++++++++-------
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/bin/testnode.rs b/src/bin/testnode.rs
index 41c6550db..ca4a6f7a3 100644
--- a/src/bin/testnode.rs
+++ b/src/bin/testnode.rs
@@ -123,7 +123,7 @@ fn main() {
 
     let gossip_sock = UdpSocket::bind(&gossip_addr).unwrap();
     let replicate_sock = UdpSocket::bind(&replicate_addr).unwrap();
-    let _events_sock = UdpSocket::bind(&events_addr).unwrap();
+    let events_sock = UdpSocket::bind(&events_addr).unwrap();
     let pubkey = KeyPair::new().pubkey();
     let d = ReplicatedData::new(
         pubkey,
@@ -144,6 +144,7 @@ fn main() {
         Some(Duration::from_millis(1000)),
         d,
         serve_sock,
+        events_sock,
         broadcast_socket,
         respond_socket,
         gossip_sock,
diff --git a/src/server.rs b/src/server.rs
index e8893d15b..7cdad5fe2 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -22,6 +22,7 @@ impl Server {
         tick_duration: Option<Duration>,
         me: ReplicatedData,
         requests_socket: UdpSocket,
+        _events_socket: UdpSocket,
         broadcast_socket: UdpSocket,
         respond_socket: UdpSocket,
         gossip: UdpSocket,
diff --git a/src/thin_client.rs b/src/thin_client.rs
index 28aff97c6..30036c340 100644
--- a/src/thin_client.rs
+++ b/src/thin_client.rs
@@ -177,16 +177,18 @@ mod tests {
     fn test_thin_client() {
         logger::setup();
         let gossip = UdpSocket::bind("0.0.0.0:0").unwrap();
-        let serve = UdpSocket::bind("0.0.0.0:0").unwrap();
-        serve.set_read_timeout(Some(Duration::new(1, 0))).unwrap();
-        let _events_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
-        let addr = serve.local_addr().unwrap();
+        let requests_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
+        requests_socket
+            .set_read_timeout(Some(Duration::new(1, 0)))
+            .unwrap();
+        let events_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
+        let addr = requests_socket.local_addr().unwrap();
         let pubkey = KeyPair::new().pubkey();
         let d = ReplicatedData::new(
             pubkey,
             gossip.local_addr().unwrap(),
             "0.0.0.0:0".parse().unwrap(),
-            serve.local_addr().unwrap(),
+            requests_socket.local_addr().unwrap(),
         );
 
         let alice = Mint::new(10_000);
@@ -194,7 +196,7 @@ mod tests {
         let bob_pubkey = KeyPair::new().pubkey();
         let exit = Arc::new(AtomicBool::new(false));
 
-        let mut local = serve.local_addr().unwrap();
+        let mut local = requests_socket.local_addr().unwrap();
         local.set_port(0);
         let broadcast_socket = UdpSocket::bind(local).unwrap();
         let respond_socket = UdpSocket::bind(local.clone()).unwrap();
@@ -204,7 +206,8 @@ mod tests {
             alice.last_id(),
             Some(Duration::from_millis(30)),
             d,
-            serve,
+            requests_socket,
+            events_socket,
             broadcast_socket,
             respond_socket,
             gossip,
@@ -251,6 +254,7 @@ mod tests {
 
         let mut local = leader_serve.local_addr().unwrap();
         local.set_port(0);
+        let events_socket = UdpSocket::bind("0.0.0.0:0").unwrap();
         let broadcast_socket = UdpSocket::bind(local).unwrap();
         let respond_socket = UdpSocket::bind(local.clone()).unwrap();
 
@@ -260,6 +264,7 @@ mod tests {
             Some(Duration::from_millis(30)),
             leader_data,
             leader_serve,
+            events_socket,
             broadcast_socket,
             respond_socket,
             leader_gossip,
@@ -411,6 +416,7 @@ mod tests {
             None,
             leader.0.clone(),
             leader.2,
+            leader.4,
             broadcast_socket,
             respond_socket,
             leader.1,