Remove TunnelArgs::resource_dirtunnel-args-remove-resource-dir

4 files changed, 5 insertions, 12 deletions

diff --git a/talpid-core/src/tunnel_state_machine/connecting_state.rs b/talpid-core/src/tunnel_state_machine/connecting_state.rs
index 330069df95..ba14bf7761 100644
--- a/talpid-core/src/tunnel_state_machine/connecting_state.rs
+++ b/talpid-core/src/tunnel_state_machine/connecting_state.rs
@@ -1,4 +1,4 @@
-use std::path::{Path, PathBuf};
+use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use std::thread;
 use std::time::{Duration, Instant};
@@ -144,7 +144,6 @@ impl ConnectingState {
                         shared_values.runtime.clone(),
                         tunnel_parameters,
                         &shared_values.log_dir,
-                        &shared_values.resource_dir,
                         shared_values.tun_provider.clone(),
                         &shared_values.route_manager,
                         retry_attempt,
@@ -226,7 +225,6 @@ impl ConnectingState {
         runtime: tokio::runtime::Handle,
         parameters: TunnelParameters,
         log_dir: &Option<PathBuf>,
-        resource_dir: &Path,
         tun_provider: Arc<Mutex<TunProvider>>,
         route_manager: &RouteManagerHandle,
         retry_attempt: u32,
@@ -236,7 +234,6 @@ impl ConnectingState {
 
         let route_manager = route_manager.clone();
         let log_dir = log_dir.clone();
-        let resource_dir = resource_dir.to_path_buf();
 
         let (tunnel_close_tx, tunnel_close_rx) = oneshot::channel();
         let (tunnel_close_event_tx, tunnel_close_event_rx) = oneshot::channel();
@@ -251,7 +248,6 @@ impl ConnectingState {
 
             let args = TunnelArgs {
                 runtime,
-                resource_dir: &resource_dir,
                 event_hook,
                 tunnel_close_rx,
                 tun_provider,
diff --git a/talpid-core/src/tunnel_state_machine/tunnel_monitor.rs b/talpid-core/src/tunnel_state_machine/tunnel_monitor.rs
index dd14711ae7..e40840b09f 100644
--- a/talpid-core/src/tunnel_state_machine/tunnel_monitor.rs
+++ b/talpid-core/src/tunnel_state_machine/tunnel_monitor.rs
@@ -121,7 +121,7 @@ impl TunnelMonitor {
     pub fn start(
         tunnel_parameters: &TunnelParameters,
         log_dir: &Option<path::PathBuf>,
-        args: TunnelArgs<'_>,
+        args: TunnelArgs,
     ) -> Result<Self> {
         Self::ensure_ipv6_can_be_used_if_enabled(tunnel_parameters)?;
         let log_file = Self::prepare_tunnel_log_file(log_dir.as_ref())?;
@@ -132,7 +132,7 @@ impl TunnelMonitor {
     fn start_wireguard_tunnel(
         params: &wireguard_types::TunnelParameters,
         log: Option<path::PathBuf>,
-        args: TunnelArgs<'_>,
+        args: TunnelArgs,
     ) -> Result<Self> {
         let monitor = talpid_wireguard::WireguardMonitor::start(params, args, log.as_deref())?;
         Ok(TunnelMonitor { monitor })
diff --git a/talpid-tunnel/src/lib.rs b/talpid-tunnel/src/lib.rs
index 5eca4c9dbd..75802c10a8 100644
--- a/talpid-tunnel/src/lib.rs
+++ b/talpid-tunnel/src/lib.rs
@@ -1,6 +1,5 @@
 use std::{
     net::{IpAddr, Ipv4Addr, Ipv6Addr},
-    path::Path,
     sync::{Arc, Mutex},
 };
 
@@ -34,11 +33,9 @@ pub const MIN_IPV4_MTU: u16 = 576;
 pub const MIN_IPV6_MTU: u16 = 1280;
 
 /// Arguments for creating a tunnel.
-pub struct TunnelArgs<'a> {
+pub struct TunnelArgs {
     /// Tokio runtime handle.
     pub runtime: tokio::runtime::Handle,
-    /// Resource directory path.
-    pub resource_dir: &'a Path,
     /// Callback function called when an event happens.
     pub event_hook: EventHook,
     /// Receiver oneshot channel for closing the tunnel.
diff --git a/talpid-wireguard/src/lib.rs b/talpid-wireguard/src/lib.rs
index f90f4439cb..4de887d196 100644
--- a/talpid-wireguard/src/lib.rs
+++ b/talpid-wireguard/src/lib.rs
@@ -155,7 +155,7 @@ impl WireguardMonitor {
     #[cfg(not(target_os = "android"))]
     pub fn start(
         params: &TunnelParameters,
-        args: TunnelArgs<'_>,
+        args: TunnelArgs,
         _log_path: Option<&Path>,
     ) -> Result<WireguardMonitor> {
         let userspace_wireguard = *FORCE_USERSPACE_WIREGUARD || params.options.daita;