Rename api to access_mode in mullvad-api

Author: buggmagnet

mullvad-api/src/api.rs mullvad-api/src/access_mode.rs

@@ -25,7 +25,7 @@ use availability::ApiAvailability;
 pub mod rest;
 
 mod abortable_stream;
-pub mod api;
+pub mod access_mode;
 mod https_client_with_sni;
 pub mod proxy;
 mod tls_stream;

mullvad-api/src/lib.rs

@@ -1,5 +1,5 @@
 use crate::{settings, Daemon};
-use mullvad_api::{api, proxy::ApiConnectionMode, rest, ApiProxy};
+use mullvad_api::{access_mode, proxy::ApiConnectionMode, rest, ApiProxy};
 use mullvad_types::{
     access_method::{self, AccessMethod, AccessMethodSetting},
     settings::Settings,
@@ -16,7 +16,7 @@ pub enum Error {
     /// Some error occured in the daemon's state of handling
     /// [`AccessMethodSetting`]s & [`ApiConnectionMode`]s
     #[error("Error occured when handling connection settings & details")]
-    ApiService(#[from] api::Error),
+    ApiService(#[from] access_mode::Error),
     /// A REST request failed
     #[error("Reset request failed")]
     Rest(#[from] rest::Error),
@@ -153,9 +153,9 @@ impl Daemon {
     #[cfg(not(target_os = "android"))]
     pub(crate) async fn test_access_method(
         proxy: talpid_types::net::AllowedEndpoint,
-        access_method_selector: api::AccessModeSelectorHandle,
+        access_method_selector: access_mode::AccessModeSelectorHandle,
         daemon_event_sender: crate::DaemonEventSender<(
-            api::AccessMethodEvent,
+            access_mode::AccessMethodEvent,
             futures::channel::oneshot::Sender<()>,
         )>,
         api_proxy: ApiProxy,
@@ -165,13 +165,13 @@ impl Daemon {
             .await
             .map(|connection_mode| connection_mode.endpoint)?;
 
-        api::AccessMethodEvent::Allow { endpoint: proxy }
+        access_mode::AccessMethodEvent::Allow { endpoint: proxy }
             .send(daemon_event_sender.to_unbounded_sender())
             .await?;
 
         let result = Self::perform_api_request(api_proxy).await;
 
-        api::AccessMethodEvent::Allow { endpoint: reset }
+        access_mode::AccessMethodEvent::Allow { endpoint: reset }
             .send(daemon_event_sender.to_unbounded_sender())
             .await?;
 
@@ -181,9 +181,9 @@ impl Daemon {
     #[cfg(target_os = "android")]
     pub(crate) async fn test_access_method(
         _: talpid_types::net::AllowedEndpoint,
-        _: api::AccessModeSelectorHandle,
+        _: access_mode::AccessModeSelectorHandle,
         _: crate::DaemonEventSender<(
-            api::AccessMethodEvent,
+            access_mode::AccessMethodEvent,
             futures::channel::oneshot::Sender<()>,
         )>,
         api_proxy: ApiProxy,

mullvad-daemon/src/access_method.rs

@@ -41,7 +41,7 @@ use futures::{
 use geoip::GeoIpHandler;
 use leak_checker::{LeakChecker, LeakInfo};
 use management_interface::ManagementInterfaceServer;
-use mullvad_api::{api::AccessMethodEvent, proxy::AllowedClientsProvider, ApiEndpoint};
+use mullvad_api::{access_mode::AccessMethodEvent, proxy::AllowedClientsProvider, ApiEndpoint};
 use mullvad_relay_selector::{RelaySelector, SelectorConfig};
 #[cfg(target_os = "android")]
 use mullvad_types::account::{PlayPurchase, PlayPurchasePaymentToken};
@@ -196,7 +196,7 @@ pub enum Error {
     AccessMethodError(#[source] access_method::Error),
 
     #[error("API connection mode error")]
-    ApiConnectionModeError(#[source] mullvad_api::api::Error),
+    ApiConnectionModeError(#[source] mullvad_api::access_mode::Error),
     #[error("No custom bridge has been specified")]
     NoCustomProxySaved,
 
@@ -610,7 +610,7 @@ pub struct Daemon {
     account_history: account_history::AccountHistory,
     device_checker: device::TunnelStateChangeHandler,
     account_manager: device::AccountManagerHandle,
-    access_mode_handler: mullvad_api::api::AccessModeSelectorHandle,
+    access_mode_handler: mullvad_api::access_mode::AccessModeSelectorHandle,
     api_runtime: mullvad_api::Runtime,
     api_handle: mullvad_api::rest::MullvadRestHandle,
     version_updater_handle: version_check::VersionUpdaterHandle,
@@ -707,7 +707,7 @@ impl Daemon {
         });
 
         let (access_mode_handler, access_mode_provider) =
-            mullvad_api::api::AccessModeSelector::<AllowedClientsSelector>::spawn(
+            mullvad_api::access_mode::AccessModeSelector::<AllowedClientsSelector>::spawn(
                 config.cache_dir.clone(),
                 relay_selector.clone(),
                 settings.api_access_methods.clone(),
@@ -2892,9 +2892,10 @@ impl Daemon {
         {
             Ok(Some(test_subject)) => test_subject,
             Ok(None) => {
-                let error = Error::ApiConnectionModeError(mullvad_api::api::Error::Resolve {
-                    access_method: access_method.access_method,
-                });
+                let error =
+                    Error::ApiConnectionModeError(mullvad_api::access_mode::Error::Resolve {
+                        access_method: access_method.access_method,
+                    });
                 reply(Err(error));
                 return;
             }