network: fix build on windows

mysten-infra/crates/mysten-network/src/client.rs

@@ -3,7 +3,7 @@
 
 use crate::{
     config::Config,
-    multiaddr::{parse_dns, parse_ip4, parse_ip6, parse_unix},
+    multiaddr::{parse_dns, parse_ip4, parse_ip6},
 };
 use anyhow::{anyhow, Context, Result};
 use multiaddr::{Multiaddr, Protocol};
@@ -57,7 +57,7 @@ fn endpoint_from_multiaddr(addr: &Multiaddr) -> Result<MyEndpoint> {
         // Protocol::Memory(_) => todo!(),
         #[cfg(unix)]
         Protocol::Unix(_) => {
-            let (path, http_or_https) = parse_unix(addr)?;
+            let (path, http_or_https) = crate::multiaddr::parse_unix(addr)?;
             let uri = format!("{http_or_https}://localhost");
             MyEndpoint::try_from_uri(uri)?.with_uds_connector(path.as_ref().into())
         }
@@ -69,13 +69,15 @@ fn endpoint_from_multiaddr(addr: &Multiaddr) -> Result<MyEndpoint> {
 
 struct MyEndpoint {
     endpoint: Endpoint,
+    #[cfg(unix)]
     uds_connector: Option<PathBuf>,
 }
 
 impl MyEndpoint {
     fn new(endpoint: Endpoint) -> Self {
         Self {
             endpoint,
+            #[cfg(unix)]
             uds_connector: None,
         }
     }
@@ -88,6 +90,7 @@ impl MyEndpoint {
         Ok(Self::new(endpoint))
     }
 
+    #[cfg(unix)]
     fn with_uds_connector(self, path: PathBuf) -> Self {
         Self {
             endpoint: self.endpoint,
@@ -101,33 +104,37 @@ impl MyEndpoint {
     }
 
     fn connect_lazy(self) -> Channel {
+        #[cfg(unix)]
         if let Some(path) = self.uds_connector {
-            self.endpoint
+            return self
+                .endpoint
                 .connect_with_connector_lazy(tower::service_fn(move |_: Uri| {
                     let path = path.clone();
 
                     // Connect to a Uds socket
                     tokio::net::UnixStream::connect(path)
-                }))
-        } else {
-            self.endpoint.connect_lazy()
+                }));
         }
+
+        self.endpoint.connect_lazy()
     }
 
     async fn connect(self) -> Result<Channel> {
+        #[cfg(unix)]
         if let Some(path) = self.uds_connector {
-            self.endpoint
+            return self
+                .endpoint
                 .connect_with_connector(tower::service_fn(move |_: Uri| {
                     let path = path.clone();
 
                     // Connect to a Uds socket
                     tokio::net::UnixStream::connect(path)
                 }))
                 .await
-                .map_err(Into::into)
-        } else {
-            self.endpoint.connect().await.map_err(Into::into)
+                .map_err(Into::into);
         }
+
+        self.endpoint.connect().await.map_err(Into::into)
     }
 }
 

mysten-infra/crates/mysten-network/src/server.rs

@@ -3,14 +3,14 @@
 
 use crate::{
     config::Config,
-    multiaddr::{parse_dns, parse_ip4, parse_ip6, parse_unix},
+    multiaddr::{parse_dns, parse_ip4, parse_ip6},
 };
 use anyhow::{anyhow, Result};
 use futures::FutureExt;
 use multiaddr::{Multiaddr, Protocol};
 use std::{convert::Infallible, net::SocketAddr};
-use tokio::net::{TcpListener, ToSocketAddrs, UnixListener};
-use tokio_stream::wrappers::{TcpListenerStream, UnixListenerStream};
+use tokio::net::{TcpListener, ToSocketAddrs};
+use tokio_stream::wrappers::TcpListenerStream;
 use tonic::{
     body::BoxBody,
     codegen::{
@@ -147,9 +147,9 @@ impl ServerBuilder {
                 // Protocol::Memory(_) => todo!(),
                 #[cfg(unix)]
                 Protocol::Unix(_) => {
-                    let (path, _http_or_https) = parse_unix(addr)?;
-                    let uds = UnixListener::bind(path.as_ref())?;
-                    let uds_stream = UnixListenerStream::new(uds);
+                    let (path, _http_or_https) = crate::multiaddr::parse_unix(addr)?;
+                    let uds = tokio::net::UnixListener::bind(path.as_ref())?;
+                    let uds_stream = tokio_stream::wrappers::UnixListenerStream::new(uds);
                     let local_addr = addr.to_owned();
                     let server = Box::pin(
                         self.router