Browse Source

Define small lib.rs for integration testing.

wip
Titouan Rigoudy 4 years ago
parent
commit
571f7cd3e9
8 changed files with 13 additions and 4 deletions
  1. +2
    -0
      src/lib.rs
  2. +2
    -1
      src/proto/handler.rs
  3. +2
    -0
      src/proto/peer/message.rs
  4. +2
    -2
      src/proto/server/client.rs
  5. +1
    -0
      src/proto/server/mod.rs
  6. +2
    -0
      src/proto/server/response.rs
  7. +1
    -1
      src/proto/server/testing.rs
  8. +1
    -0
      src/proto/stream.rs

+ 2
- 0
src/lib.rs View File

@ -0,0 +1,2 @@
mod config;
pub mod proto;

+ 2
- 1
src/proto/handler.rs View File

@ -4,13 +4,14 @@ use std::net;
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
use crossbeam_channel; use crossbeam_channel;
use log::{error, info};
use mio; use mio;
use slab; use slab;
use crate::config; use crate::config;
use super::peer; use super::peer;
use super::server::*;
use super::server::{ServerRequest, ServerResponse};
use super::{Intent, SendPacket, Stream}; use super::{Intent, SendPacket, Stream};
/*===========* /*===========*


+ 2
- 0
src/proto/peer/message.rs View File

@ -1,5 +1,7 @@
use std::io; use std::io;
use log::warn;
use crate::proto::core::value::{ use crate::proto::core::value::{
ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError, ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
ValueEncoder, ValueEncoder,


+ 2
- 2
src/proto/server/client.rs View File

@ -65,7 +65,7 @@ enum RunOnceResult {
} }
impl Client { impl Client {
async fn login(
pub async fn login(
tcp_stream: net::TcpStream, tcp_stream: net::TcpStream,
options: ClientOptions, options: ClientOptions,
) -> Result<Client, ClientLoginError> { ) -> Result<Client, ClientLoginError> {
@ -144,7 +144,7 @@ impl Client {
) )
} }
fn run<S>(
pub fn run<S>(
mut self, mut self,
mut request_stream: S, mut request_stream: S,
) -> impl Stream<Item = Result<ServerResponse, ClientRunError>> + Unpin ) -> impl Stream<Item = Result<ServerResponse, ClientRunError>> + Unpin


+ 1
- 0
src/proto/server/mod.rs View File

@ -7,6 +7,7 @@ mod response;
mod testing; mod testing;
mod version; mod version;
pub use self::client::{Client, ClientOptions};
pub use self::credentials::Credentials; pub use self::credentials::Credentials;
pub use self::request::*; pub use self::request::*;
pub use self::response::*; pub use self::response::*;


+ 2
- 0
src/proto/server/response.rs View File

@ -1,5 +1,7 @@
use std::net; use std::net;
use log::{debug, error, warn};
use crate::proto::core::value::{ use crate::proto::core::value::{
ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError, ValueDecode, ValueDecodeError, ValueDecoder, ValueEncode, ValueEncodeError,
ValueEncoder, ValueEncoder,


+ 1
- 1
src/proto/server/testing.rs View File

@ -5,7 +5,7 @@ use std::io;
use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use std::sync::Arc; use std::sync::Arc;
use log::{info, warn};
use log::{debug, info, warn};
use parking_lot::Mutex; use parking_lot::Mutex;
use tokio::net::{TcpListener, TcpStream}; use tokio::net::{TcpListener, TcpStream};
use tokio::sync::mpsc; use tokio::sync::mpsc;


+ 1
- 0
src/proto/stream.rs View File

@ -4,6 +4,7 @@ use std::fmt;
use std::io; use std::io;
use std::net::ToSocketAddrs; use std::net::ToSocketAddrs;
use log::{error, info};
use mio; use mio;
use super::packet::{MutPacket, Parser, ReadFromPacket, WriteToPacket}; use super::packet::{MutPacket, Parser, ReadFromPacket, WriteToPacket};


Loading…
Cancel
Save