From 571f7cd3e9f5623e310b374ce503eb539086efe7 Mon Sep 17 00:00:00 2001
From: Titouan Rigoudy <titouan.rigoudy@gmail.com>
Date: Sun, 24 Jan 2021 16:27:06 +0100
Subject: [PATCH] Define small lib.rs for integration testing.

---
 src/lib.rs                   | 2 ++
 src/proto/handler.rs         | 3 ++-
 src/proto/peer/message.rs    | 2 ++
 src/proto/server/client.rs   | 4 ++--
 src/proto/server/mod.rs      | 1 +
 src/proto/server/response.rs | 2 ++
 src/proto/server/testing.rs  | 2 +-
 src/proto/stream.rs          | 1 +
 8 files changed, 13 insertions(+), 4 deletions(-)
 create mode 100644 src/lib.rs

diff --git a/src/lib.rs b/src/lib.rs
new file mode 100644
index 0000000..95f7e01
--- /dev/null
+++ b/src/lib.rs
@@ -0,0 +1,2 @@
+mod config;
+pub mod proto;
diff --git a/src/proto/handler.rs b/src/proto/handler.rs
index 75986a4..480c827 100644
--- a/src/proto/handler.rs
+++ b/src/proto/handler.rs
@@ -4,13 +4,14 @@ use std::net;
 use std::net::ToSocketAddrs;
 
 use crossbeam_channel;
+use log::{error, info};
 use mio;
 use slab;
 
 use crate::config;
 
 use super::peer;
-use super::server::*;
+use super::server::{ServerRequest, ServerResponse};
 use super::{Intent, SendPacket, Stream};
 
 /*===========*
diff --git a/src/proto/peer/message.rs b/src/proto/peer/message.rs
index 59adab0..967fdc3 100644
--- a/src/proto/peer/message.rs
+++ b/src/proto/peer/message.rs
@@ -1,5 +1,7 @@
 use std::io;
 
+use log::warn;
+
 use crate::proto::core::value::{
   ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
   ValueEncoder,
diff --git a/src/proto/server/client.rs b/src/proto/server/client.rs
index 15f12f8..7110693 100644
--- a/src/proto/server/client.rs
+++ b/src/proto/server/client.rs
@@ -65,7 +65,7 @@ enum RunOnceResult {
 }
 
 impl Client {
-  async fn login(
+  pub async fn login(
     tcp_stream: net::TcpStream,
     options: ClientOptions,
   ) -> Result<Client, ClientLoginError> {
@@ -144,7 +144,7 @@ impl Client {
     )
   }
 
-  fn run<S>(
+  pub fn run<S>(
     mut self,
     mut request_stream: S,
   ) -> impl Stream<Item = Result<ServerResponse, ClientRunError>> + Unpin
diff --git a/src/proto/server/mod.rs b/src/proto/server/mod.rs
index 2e65951..b762b04 100644
--- a/src/proto/server/mod.rs
+++ b/src/proto/server/mod.rs
@@ -7,6 +7,7 @@ mod response;
 mod testing;
 mod version;
 
+pub use self::client::{Client, ClientOptions};
 pub use self::credentials::Credentials;
 pub use self::request::*;
 pub use self::response::*;
diff --git a/src/proto/server/response.rs b/src/proto/server/response.rs
index 9a7d7b7..d20b559 100644
--- a/src/proto/server/response.rs
+++ b/src/proto/server/response.rs
@@ -1,5 +1,7 @@
 use std::net;
 
+use log::{debug, error, warn};
+
 use crate::proto::core::value::{
   ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
   ValueEncoder,
diff --git a/src/proto/server/testing.rs b/src/proto/server/testing.rs
index d571056..b9eeeeb 100644
--- a/src/proto/server/testing.rs
+++ b/src/proto/server/testing.rs
@@ -5,7 +5,7 @@ use std::io;
 use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 use std::sync::Arc;
 
-use log::{info, warn};
+use log::{debug, info, warn};
 use parking_lot::Mutex;
 use tokio::net::{TcpListener, TcpStream};
 use tokio::sync::mpsc;
diff --git a/src/proto/stream.rs b/src/proto/stream.rs
index a829690..76f9952 100644
--- a/src/proto/stream.rs
+++ b/src/proto/stream.rs
@@ -4,6 +4,7 @@ use std::fmt;
 use std::io;
 use std::net::ToSocketAddrs;
 
+use log::{error, info};
 use mio;
 
 use super::packet::{MutPacket, Parser, ReadFromPacket, WriteToPacket};