From 63bbdfa523f0bfe1b1f5fc7772806037f3141308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jon=20H=C3=A4ggblad?= <jon.haggblad@gmail.com>
Date: Thu, 5 Oct 2023 09:03:12 +0200
Subject: [PATCH] Move platform specific code to platform directory

---
 common/wireguard/src/lib.rs                        | 14 ++++++--------
 common/wireguard/src/platform/linux/mod.rs         |  1 +
 .../src/{ => platform/linux}/tun_device.rs         |  0
 common/wireguard/src/platform/mod.rs               |  2 ++
 common/wireguard/src/tun.rs                        |  2 +-
 gateway/Cargo.toml                                 |  2 --
 6 files changed, 10 insertions(+), 11 deletions(-)
 create mode 100644 common/wireguard/src/platform/linux/mod.rs
 rename common/wireguard/src/{ => platform/linux}/tun_device.rs (100%)
 create mode 100644 common/wireguard/src/platform/mod.rs

diff --git a/common/wireguard/src/lib.rs b/common/wireguard/src/lib.rs
index b42a9a6d88..15383eb335 100644
--- a/common/wireguard/src/lib.rs
+++ b/common/wireguard/src/lib.rs
@@ -1,20 +1,18 @@
+#![cfg_attr(not(target_os = "linux"), allow(dead_code))]
+
 use nym_task::TaskClient;
 
-pub use error::WgError;
-
 mod error;
-#[cfg(target_os = "linux")]
 mod event;
-#[cfg(target_os = "linux")]
+mod platform;
 mod setup;
-#[cfg(target_os = "linux")]
 mod tun;
-#[cfg(target_os = "linux")]
-mod tun_device;
-#[cfg(target_os = "linux")]
 mod udp_listener;
 
+// Currently the module related to setting up the virtual network device is platform specific.
 #[cfg(target_os = "linux")]
+use platform::linux::tun_device;
+
 type ActivePeers =
     dashmap::DashMap<std::net::SocketAddr, tokio::sync::mpsc::UnboundedSender<crate::event::Event>>;
 
diff --git a/common/wireguard/src/platform/linux/mod.rs b/common/wireguard/src/platform/linux/mod.rs
new file mode 100644
index 0000000000..ebe0ba212c
--- /dev/null
+++ b/common/wireguard/src/platform/linux/mod.rs
@@ -0,0 +1 @@
+pub(crate) mod tun_device;
diff --git a/common/wireguard/src/tun_device.rs b/common/wireguard/src/platform/linux/tun_device.rs
similarity index 100%
rename from common/wireguard/src/tun_device.rs
rename to common/wireguard/src/platform/linux/tun_device.rs
diff --git a/common/wireguard/src/platform/mod.rs b/common/wireguard/src/platform/mod.rs
new file mode 100644
index 0000000000..2305239628
--- /dev/null
+++ b/common/wireguard/src/platform/mod.rs
@@ -0,0 +1,2 @@
+#[cfg(target_os = "linux")]
+pub(crate) mod linux;
diff --git a/common/wireguard/src/tun.rs b/common/wireguard/src/tun.rs
index 320942af12..3dbafecf32 100644
--- a/common/wireguard/src/tun.rs
+++ b/common/wireguard/src/tun.rs
@@ -15,7 +15,7 @@ use tokio::{
     time::timeout,
 };
 
-use crate::{event::Event, WgError};
+use crate::{error::WgError, event::Event};
 
 const MAX_PACKET: usize = 65535;
 
diff --git a/gateway/Cargo.toml b/gateway/Cargo.toml
index bb4a8e9c69..7439ab8336 100644
--- a/gateway/Cargo.toml
+++ b/gateway/Cargo.toml
@@ -62,8 +62,6 @@ nym-statistics-common = { path = "../common/statistics" }
 nym-task = { path = "../common/task" }
 nym-types = { path = "../common/types" }
 nym-validator-client = { path = "../common/client-libs/validator-client" }
-
-[target.'cfg(target_os = "linux")'.dependencies]
 nym-wireguard = { path = "../common/wireguard", optional = true }
 
 [build-dependencies]