refactor(app/integration): inline Running future (linkerd#3686)

`linkerd_app_integration::running()` is a public function that is not used by any external callers. this function is used in one place, when setting up test client used for integration tests. this commit inlines this logic, and moves the associated `Running` type alias down alongside the `Run` enum. Signed-off-by: katelyn martin <[email protected]>
makesoftwaresafe · Mar 3, 2025 · be86830 · be86830
1 parent 93aecec
commit be86830
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/linkerd/app/integration/src/client.rs b/linkerd/app/integration/src/client.rs
@@ -220,6 +220,8 @@ enum Run {
     Http2,
 }
 
+pub type Running = Pin<Box<dyn Future<Output = ()> + Send + Sync + 'static>>;
+
 fn run(
     addr: SocketAddr,
     version: Run,
@@ -235,7 +237,12 @@ fn run(
         false
     };
 
-    let (running_tx, running) = running();
+    let (running_tx, running) = {
+        let (tx, rx) = oneshot::channel();
+        let rx = Box::pin(rx.map(|_| ()));
+        (tx, rx)
+    };
+
     let conn = Conn {
         addr,
         absolute_uris,

diff --git a/linkerd/app/integration/src/lib.rs b/linkerd/app/integration/src/lib.rs
@@ -217,15 +217,6 @@ impl Shutdown {
 
 pub type ShutdownRx = Pin<Box<dyn Future<Output = ()> + Send>>;
 
-/// A channel used to signal when a Client's related connection is running or closed.
-pub fn running() -> (oneshot::Sender<()>, Running) {
-    let (tx, rx) = oneshot::channel();
-    let rx = Box::pin(rx.map(|_| ()));
-    (tx, rx)
-}
-
-pub type Running = Pin<Box<dyn Future<Output = ()> + Send + Sync + 'static>>;
-
 pub fn s(bytes: &[u8]) -> &str {
     ::std::str::from_utf8(bytes).unwrap()
 }