diff --git a/crates/ptth_quic/src/executable_relay_server.rs b/crates/ptth_quic/src/executable_relay_server.rs index c7321b8..f84b8ff 100644 --- a/crates/ptth_quic/src/executable_relay_server.rs +++ b/crates/ptth_quic/src/executable_relay_server.rs @@ -18,14 +18,14 @@ use crate::prelude::*; use protocol::PeerId; #[derive (Debug, StructOpt)] -pub struct Opt { +pub (crate) struct Opt { #[structopt (long)] - listen_addr: Option , + pub (crate) listen_addr: Option , #[structopt (long)] - tcp_listen_port: Option , + pub (crate) tcp_listen_port: Option , } -pub async fn main (opt: Opt) -> anyhow::Result <()> +pub (crate) async fn main (opt: Opt) -> anyhow::Result <()> { let listen_addr = opt.listen_addr.unwrap_or_else (|| String::from ("0.0.0.0:30380")).parse ()?; let (endpoint, server_cert) = make_server_endpoint (listen_addr)?; diff --git a/crates/ptth_quic/src/tests.rs b/crates/ptth_quic/src/tests.rs index d110bc6..ff41920 100644 --- a/crates/ptth_quic/src/tests.rs +++ b/crates/ptth_quic/src/tests.rs @@ -6,9 +6,16 @@ fn end_to_end () -> anyhow::Result <()> { } async fn end_to_end_async () -> anyhow::Result <()> { + use crate::executable_relay_server as relay; - - // let task_relay = crate::executable_relay_server::main (); + let relay_opt = relay::Opt { + listen_addr: "127.0.0.1:30381".to_string ().into (), + tcp_listen_port: 8001.into (), + }; + let task_relay = tokio::spawn (async move { + relay::main (relay_opt).await?; + Ok::<_, anyhow::Error> (()) + }); Ok (()) }