cleanup of stub structs

n0-computer · Nov 26, 2024 · c08c6e9 · c08c6e9
1 parent b0cb517
commit c08c6e9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 21 deletions.
diff --git a/iroh-net/src/test_utils.rs b/iroh-net/src/test_utils.rs
@@ -39,9 +39,6 @@ pub async fn run_relay_server() -> Result<(RelayMap, RelayUrl, Server)> {
 pub async fn run_relay_server_with(
     stun: Option<StunConfig>,
 ) -> Result<(RelayMap, RelayUrl, Server)> {
-    #[derive(Default, Debug, derive_more::Display)]
-    struct Stub;
-
     let cert =
         rcgen::generate_simple_self_signed(vec!["localhost".to_string(), "127.0.0.1".to_string()])
             .expect("valid");
@@ -53,7 +50,7 @@ pub async fn run_relay_server_with(
         relay: Some(RelayConfig {
             http_bind_addr: (Ipv4Addr::LOCALHOST, 0).into(),
             tls: Some(TlsConfig {
-                cert: CertConfig::<Stub, Stub>::Manual {
+                cert: CertConfig::<(), ()>::Manual {
                     private_key,
                     certs: vec![rustls_cert.clone()],
                 },

diff --git a/iroh-relay/src/server.rs b/iroh-relay/src/server.rs
@@ -707,11 +707,8 @@ mod tests {
     };
 
     async fn spawn_local_relay() -> Result<Server> {
-        #[derive(Debug)]
-        struct Stub;
-
-        Server::spawn(ServerConfig::<Stub, Stub> {
-            relay: Some(RelayConfig::<Stub, Stub> {
+        Server::spawn(ServerConfig::<(), ()> {
+            relay: Some(RelayConfig::<(), ()> {
                 http_bind_addr: (Ipv4Addr::LOCALHOST, 0).into(),
                 tls: None,
                 limits: Default::default(),
@@ -724,11 +721,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_no_services() {
-        #[derive(Default, Debug)]
-        struct Stub;
-
         let _guard = iroh_test::logging::setup();
-        let mut server = Server::spawn(ServerConfig::<Stub, Stub>::default())
+        let mut server = Server::spawn(ServerConfig::<(), ()>::default())
             .await
             .unwrap();
         let res = tokio::time::timeout(Duration::from_secs(5), server.task_handle())
@@ -740,11 +734,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_conflicting_bind() {
-        #[derive(Debug)]
-        struct Stub;
-
         let _guard = iroh_test::logging::setup();
-        let mut server = Server::spawn(ServerConfig::<Stub, Stub> {
+        let mut server = Server::spawn(ServerConfig::<(), ()> {
             relay: Some(RelayConfig {
                 http_bind_addr: (Ipv4Addr::LOCALHOST, 1234).into(),
                 tls: None,
@@ -1015,11 +1006,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_stun() {
-        #[derive(Debug)]
-        struct Stub;
-
         let _guard = iroh_test::logging::setup();
-        let server = Server::spawn(ServerConfig::<Stub, Stub> {
+        let server = Server::spawn(ServerConfig::<(), ()> {
             relay: None,
             stun: Some(StunConfig {
                 bind_addr: (Ipv4Addr::LOCALHOST, 0).into(),