Remove cache_dir from NetworkSecurity constructor

6 files changed, 10 insertions, 14 deletions

diff --git a/talpid-core/src/security/linux/mod.rs b/talpid-core/src/security/linux/mod.rs
index 7c7d1f64d9..a7897f0cc1 100644
--- a/talpid-core/src/security/linux/mod.rs
+++ b/talpid-core/src/security/linux/mod.rs
@@ -16,7 +16,6 @@ use std::{
     ffi::CString,
     io,
     net::{IpAddr, Ipv4Addr},
-    path::Path,
 };
 use talpid_types::net::{Endpoint, TransportProtocol};
 
@@ -78,7 +77,7 @@ pub struct NetworkSecurity {
 impl NetworkSecurityT for NetworkSecurity {
     type Error = Error;
 
-    fn new(_cache_dir: impl AsRef<Path>) -> Result<Self> {
+    fn new() -> Result<Self> {
         Ok(NetworkSecurity {
             table_name: TABLE_NAME.clone(),
         })
diff --git a/talpid-core/src/security/macos/dns.rs b/talpid-core/src/security/macos/dns.rs
index 56126fb20f..4937ffab03 100644
--- a/talpid-core/src/security/macos/dns.rs
+++ b/talpid-core/src/security/macos/dns.rs
@@ -17,10 +17,10 @@ use log::{debug, trace};
 use std::{
     collections::HashMap,
     fmt,
+    net::IpAddr,
+    path::Path,
     sync::{mpsc, Arc, Mutex},
     thread,
-    path::Path,
-    net::IpAddr,
 };
 
 error_chain! {
diff --git a/talpid-core/src/security/macos/mod.rs b/talpid-core/src/security/macos/mod.rs
index 1fdb0c49b3..14a271ce89 100644
--- a/talpid-core/src/security/macos/mod.rs
+++ b/talpid-core/src/security/macos/mod.rs
@@ -3,7 +3,6 @@ extern crate tokio_core;
 
 use super::{NetworkSecurityT, SecurityPolicy};
 use std::net::Ipv4Addr;
-use std::path::Path;
 use talpid_types::net;
 
 mod dns;
@@ -26,7 +25,7 @@ pub struct NetworkSecurity {
 impl NetworkSecurityT for NetworkSecurity {
     type Error = Error;
 
-    fn new(_cache_dir: impl AsRef<Path>) -> Result<Self> {
+    fn new() -> Result<Self> {
         Ok(NetworkSecurity {
             pf: pfctl::PfCtl::new()?,
             pf_was_enabled: None,
diff --git a/talpid-core/src/security/mod.rs b/talpid-core/src/security/mod.rs
index 4d3a26cd13..d057fb8336 100644
--- a/talpid-core/src/security/mod.rs
+++ b/talpid-core/src/security/mod.rs
@@ -3,9 +3,9 @@ use ipnetwork::{IpNetwork, Ipv4Network, Ipv6Network};
 #[cfg(unix)]
 use lazy_static::lazy_static;
 use std::fmt;
+use std::net::IpAddr;
 #[cfg(unix)]
 use std::net::{Ipv4Addr, Ipv6Addr};
-use std::net::IpAddr;
 use std::path::Path;
 use talpid_types::net::Endpoint;
 
@@ -115,9 +115,9 @@ pub struct NetworkSecurity {
 
 impl NetworkSecurity {
     /// Returns a new `NetworkSecurity`, ready to apply policies.
-    pub fn new(cache_dir: impl AsRef<Path>) -> Result<Self, Error> {
+    pub fn new() -> Result<Self, Error> {
         Ok(NetworkSecurity {
-            inner: imp::NetworkSecurity::new(cache_dir)?,
+            inner: imp::NetworkSecurity::new()?,
         })
     }
 
@@ -176,7 +176,7 @@ trait NetworkSecurityT: Sized {
     type Error: ::std::error::Error;
 
     /// Create new instance
-    fn new(cache_dir: impl AsRef<Path>) -> ::std::result::Result<Self, Self::Error>;
+    fn new() -> ::std::result::Result<Self, Self::Error>;
 
     /// Enable the given SecurityPolicy
     fn apply_policy(&mut self, policy: SecurityPolicy) -> ::std::result::Result<(), Self::Error>;
diff --git a/talpid-core/src/security/windows/mod.rs b/talpid-core/src/security/windows/mod.rs
index b6b99f8351..35dd57a1de 100644
--- a/talpid-core/src/security/windows/mod.rs
+++ b/talpid-core/src/security/windows/mod.rs
@@ -1,5 +1,4 @@
 use std::net::IpAddr;
-use std::path::Path;
 use std::ptr;
 
 use log::{debug, error, trace};
@@ -65,7 +64,7 @@ pub struct NetworkSecurity(());
 impl NetworkSecurityT for NetworkSecurity {
     type Error = Error;
 
-    fn new(_cache_dir: impl AsRef<Path>) -> Result<Self> {
+    fn new() -> Result<Self> {
         unsafe {
             WinFw_Initialize(
                 WINFW_TIMEOUT_SECONDS,
diff --git a/talpid-core/src/tunnel_state_machine/mod.rs b/talpid-core/src/tunnel_state_machine/mod.rs
index d6d9bfcc38..dcb4ada26c 100644
--- a/talpid-core/src/tunnel_state_machine/mod.rs
+++ b/talpid-core/src/tunnel_state_machine/mod.rs
@@ -191,8 +191,7 @@ impl TunnelStateMachine {
         cache_dir: impl AsRef<Path>,
         commands: mpsc::UnboundedReceiver<TunnelCommand>,
     ) -> Result<Self> {
-        let security =
-            NetworkSecurity::new(&cache_dir).chain_err(|| ErrorKind::NetworkSecurityError)?;
+        let security = NetworkSecurity::new().chain_err(|| ErrorKind::NetworkSecurityError)?;
         let dns_monitor = DnsMonitor::new(cache_dir).chain_err(|| ErrorKind::DnsMonitorError)?;
         let mut shared_values = SharedTunnelStateValues {
             security,