From 0012b1b585a54468592e6522ef522050622f7706 Mon Sep 17 00:00:00 2001
From: ntr <ntr@smokestack.io>
Date: Sun, 2 Sep 2018 13:48:06 +1000
Subject: [PATCH] tarpc last attempt

---
 src/main.rs |  4 ++--
 src/net.rs  | 30 +++++++++++++++++++-----------
 2 files changed, 21 insertions(+), 13 deletions(-)
 mode change 100644 => 100755 src/net.rs

diff --git a/src/main.rs b/src/main.rs
index 5f8cc37a..144556fe 100755
--- a/src/main.rs
+++ b/src/main.rs
@@ -19,8 +19,8 @@ mod battle;
 mod skill;
 mod net;
 
-use net::server;
+use net::run_server;
 
 fn main() {
-  server()
+    run_server()
 }
\ No newline at end of file
diff --git a/src/net.rs b/src/net.rs
old mode 100644
new mode 100755
index ba85bd37..3d831cd9
--- a/src/net.rs
+++ b/src/net.rs
@@ -19,7 +19,7 @@ impl FutureService for HelloServer {
     }
 }
 
-pub fn server() {
+pub fn run_server() {
     let mut reactor = reactor::Core::new().unwrap();
     let (mut handle, server) = HelloServer
         .listen(
@@ -28,16 +28,24 @@ pub fn server() {
             server::Options::default(),
         )
         .unwrap();
-    handle.wait();
     reactor.handle().spawn(server);
+}
 
-    // let options = client::Options::default().handle(reactor.handle());
-    // reactor
-    //     .run(
-    //         FutureClient::connect(handle.addr(), options)
-    //             .map_err(|e| panic!("{:?}", e))
-    //             .and_then(|client| client.hello("Mom".to_string()))
-    //             .map(|resp| println!("{}", resp)),
-    //     )
-    //     .unwrap();
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn connect() {
+      let mut reactor = reactor::Core::new().unwrap();
+      let options = client::Options::default().handle(reactor.handle());
+      reactor
+          .run(
+              FutureClient::connect("localhost:10000".first_socket_addr(), options)
+                  .map_err(|e| panic!("{:?}", e))
+                  .and_then(|client| client.hello("Mom".to_string()))
+                  .map(|resp| println!("{}", resp)),
+          )
+          .unwrap();
+    }
 }
\ No newline at end of file