Make Trin compilable on Windows

Author: KolbyML

ethportal-peertest/src/lib.rs

@@ -1,3 +1,4 @@
+#![cfg(unix)]
 pub mod constants;
 pub mod scenarios;
 pub mod utils;

portalnet/src/overlay_service.rs

@@ -1520,7 +1520,7 @@ where
                 Request::PopulatedOffer(offer) => Ok(response_clone
                     .content_keys
                     .iter()
-                    .zip(offer.content_items.into_iter())
+                    .zip(offer.content_items)
                     .filter(|(is_accepted, _item)| *is_accepted)
                     .map(|(_is_accepted, (_key, val))| val)
                     .collect()),

portalnet/src/storage.rs

@@ -1140,6 +1140,8 @@ pub mod test {
         // The restarted store should have the same radius as the original
         assert_eq!(radius, new_storage.radius);
 
+        drop(storage);
+        drop(new_storage);
         temp_dir.close()?;
         Ok(())
     }

src/lib.rs

@@ -8,6 +8,8 @@ use tokio::sync::RwLock;
 use tracing::info;
 use utp_rs::socket::UtpSocket;
 
+#[cfg(windows)]
+use ethportal_api::types::cli::Web3TransportType;
 use ethportal_api::types::cli::{TrinConfig, BEACON_NETWORK, HISTORY_NETWORK, STATE_NETWORK};
 use portalnet::{
     discovery::{Discovery, Discv5UdpSocket},
@@ -25,6 +27,13 @@ use trin_validation::{accumulator::MasterAccumulator, oracle::HeaderOracle};
 pub async fn run_trin(
     trin_config: TrinConfig,
 ) -> Result<RpcServerHandle, Box<dyn std::error::Error>> {
+    // Panic early on a windows build that is trying to use IPC, which is unsupported for now
+    // Make sure not to panic on non-windows configurations.
+    #[cfg(windows)]
+    if let Web3TransportType::IPC = trin_config.web3_transport {
+        panic!("Windows doesn't support Unix Domain Sockets IPC, use --web3-transport http");
+    }
+
     let trin_version = get_trin_version();
     info!("Launching Trin: v{trin_version}");
     info!(config = %trin_config, "With:");

tests/rpc_server.rs

@@ -1,3 +1,4 @@
+#![cfg(unix)]
 /// Test that a 3rd-party web3 client can understand our JSON-RPC API
 use std::net::{IpAddr, Ipv4Addr};
 

tests/self_peertest.rs

@@ -1,3 +1,4 @@
+#![cfg(unix)]
 use rpc::RpcServerHandle;
 use std::env;
 use std::net::{IpAddr, Ipv4Addr};