Move ConnectionRef into the two pools

Author: rklaehn

iroh-connection-pool/src/connection_pool.rs

@@ -10,6 +10,7 @@
 //! connect, and don't clone it out of the future.
 use std::{
     collections::{HashMap, VecDeque},
+    ops::Deref,
     sync::Arc,
     time::Duration,
 };
@@ -30,7 +31,7 @@ use tokio::{
 use tokio_util::time::FutureExt as TimeFutureExt;
 use tracing::{debug, error, trace};
 
-use crate::{ConnectionCounter, ConnectionRef};
+use crate::{ConnectionCounter, OneConnection};
 
 /// Configuration options for the connection pool
 #[derive(Debug, Clone, Copy)]
@@ -50,6 +51,30 @@ impl Default for Options {
     }
 }
 
+/// A reference to a connection that is owned by a connection pool.
+#[derive(Debug)]
+pub struct ConnectionRef {
+    connection: iroh::endpoint::Connection,
+    _permit: OneConnection,
+}
+
+impl Deref for ConnectionRef {
+    type Target = iroh::endpoint::Connection;
+
+    fn deref(&self) -> &Self::Target {
+        &self.connection
+    }
+}
+
+impl ConnectionRef {
+    fn new(connection: iroh::endpoint::Connection, counter: OneConnection) -> Self {
+        Self {
+            connection,
+            _permit: counter,
+        }
+    }
+}
+
 struct Context {
     options: Options,
     endpoint: Endpoint,

iroh-connection-pool/src/connection_pool_0rtt.rs

@@ -10,6 +10,7 @@
 //! [blog post](https://www.iroh.computer/blog/0rtt-api).
 use std::{
     collections::{HashMap, VecDeque},
+    ops::Deref,
     pin::Pin,
     sync::Arc,
     task::Poll,
@@ -33,7 +34,7 @@ use tokio::{
 use tokio_util::time::FutureExt as TimeFutureExt;
 use tracing::{debug, error, trace};
 
-use crate::{ConnectionCounter, ConnectionRef};
+use crate::{ConnectionCounter, OneConnection};
 
 /// Configuration options for the connection pool
 #[derive(Debug, Clone, Copy)]
@@ -53,6 +54,30 @@ impl Default for Options {
     }
 }
 
+/// A reference to a connection that is owned by a connection pool.
+#[derive(Debug)]
+pub struct ConnectionRef {
+    connection: iroh::endpoint::Connection,
+    _permit: OneConnection,
+}
+
+impl Deref for ConnectionRef {
+    type Target = iroh::endpoint::Connection;
+
+    fn deref(&self) -> &Self::Target {
+        &self.connection
+    }
+}
+
+impl ConnectionRef {
+    fn new(connection: iroh::endpoint::Connection, counter: OneConnection) -> Self {
+        Self {
+            connection,
+            _permit: counter,
+        }
+    }
+}
+
 struct Context {
     options: Options,
     endpoint: Endpoint,

iroh-connection-pool/src/lib.rs

@@ -1,9 +1,6 @@
-use std::{
-    ops::Deref,
-    sync::{
-        Arc,
-        atomic::{AtomicUsize, Ordering},
-    },
+use std::sync::{
+    Arc,
+    atomic::{AtomicUsize, Ordering},
 };
 
 use n0_future::Stream;
@@ -15,30 +12,6 @@ pub mod connection_pool_0rtt;
 #[cfg(test)]
 mod tests;
 
-/// A reference to a connection that is owned by a connection pool.
-#[derive(Debug)]
-pub struct ConnectionRef {
-    connection: iroh::endpoint::Connection,
-    _permit: OneConnection,
-}
-
-impl Deref for ConnectionRef {
-    type Target = iroh::endpoint::Connection;
-
-    fn deref(&self) -> &Self::Target {
-        &self.connection
-    }
-}
-
-impl ConnectionRef {
-    fn new(connection: iroh::endpoint::Connection, counter: OneConnection) -> Self {
-        Self {
-            connection,
-            _permit: counter,
-        }
-    }
-}
-
 #[derive(Debug)]
 struct ConnectionCounterInner {
     count: AtomicUsize,