Swap out talpid-core for talpid-future

Author: MarkusPettersson98

Cargo.lock

@@ -34,9 +34,10 @@ mullvad-api = { path = "../mullvad-api" }
 mullvad-fs = { path = "../mullvad-fs" }
 mullvad-version = { path = "../mullvad-version" }
 talpid-core = { path = "../talpid-core" }
-talpid-types = { path = "../talpid-types" }
+talpid-future = { path = "../talpid-future" }
 talpid-platform-metadata = { path = "../talpid-platform-metadata" }
 talpid-time = { path = "../talpid-time" }
+talpid-types = { path = "../talpid-types" }
 
 [target.'cfg(not(target_os="android"))'.dependencies]
 clap = { workspace = true }

mullvad-daemon/Cargo.toml

@@ -17,7 +17,7 @@ use mullvad_api::{
     rest::{self, MullvadRestHandle},
     AccountsProxy, DevicesProxy,
 };
-use talpid_core::future_retry::{retry_future, ConstantInterval, ExponentialBackoff, Jittered};
+use talpid_future::retry::{retry_future, ConstantInterval, ExponentialBackoff, Jittered};
 /// Retry strategy used for user-initiated actions that require immediate feedback
 const RETRY_ACTION_STRATEGY: ConstantInterval = ConstantInterval::new(Duration::ZERO, Some(3));
 /// Retry strategy used for background tasks

mullvad-daemon/src/device/service.rs

@@ -7,10 +7,8 @@ use mullvad_api::{
 };
 use mullvad_types::location::{AmIMullvad, GeoIpLocation, LocationEventData};
 use once_cell::sync::Lazy;
-use talpid_core::{
-    future_retry::{retry_future, ExponentialBackoff, Jittered},
-    mpsc::Sender,
-};
+use talpid_core::mpsc::Sender;
+use talpid_future::retry::{retry_future, ExponentialBackoff, Jittered};
 use talpid_types::ErrorExt;
 
 use crate::{DaemonEventSender, InternalDaemonEvent};

mullvad-daemon/src/geoip.rs

@@ -15,7 +15,8 @@ use std::{
     str::FromStr,
     time::Duration,
 };
-use talpid_core::{future_retry::ConstantInterval, mpsc::Sender};
+use talpid_core::mpsc::Sender;
+use talpid_future::retry::{retry_future, ConstantInterval};
 use talpid_types::ErrorExt;
 use tokio::fs::{self, File};
 
@@ -193,7 +194,7 @@ impl VersionUpdater {
                 .map_err(Error::Download)
         };
 
-        Box::pin(talpid_core::future_retry::retry_future(
+        Box::pin(retry_future(
             download_future_factory,
             move |result| Self::should_retry_immediate(result, &api_handle),
             IMMEDIATE_RETRY_STRATEGY,
@@ -233,7 +234,7 @@ impl VersionUpdater {
             }
         };
 
-        Box::pin(talpid_core::future_retry::retry_future(
+        Box::pin(retry_future(
             download_future_factory,
             |result| result.is_err(),
             std::iter::repeat(UPDATE_INTERVAL_ERROR),

mullvad-daemon/src/version_check.rs

@@ -21,7 +21,7 @@ rand = "0.8.5"
 serde_json = "1.0"
 tokio = { workspace = true, features =  ["fs", "io-util", "time"] }
 
-talpid-core = { path = "../talpid-core" }
+talpid-future = { path = "../talpid-future" }
 talpid-types = { path = "../talpid-types" }
 mullvad-api = { path = "../mullvad-api" }
 mullvad-types = { path = "../mullvad-types" }

mullvad-relay-selector/Cargo.toml

@@ -12,7 +12,7 @@ use std::{
     sync::Arc,
     time::{Duration, SystemTime, UNIX_EPOCH},
 };
-use talpid_core::future_retry::{retry_future, ExponentialBackoff, Jittered};
+use talpid_future::retry::{retry_future, ExponentialBackoff, Jittered};
 use talpid_types::ErrorExt;
 use tokio::fs::File;
 

mullvad-relay-selector/src/updater.rs

@@ -30,4 +30,5 @@ mullvad-api = { path = "../mullvad-api" }
 mullvad-types = { path = "../mullvad-types" }
 mullvad-version = { path = "../mullvad-version" }
 talpid-core = { path = "../talpid-core" }
+talpid-future = { path = "../talpid-future" }
 talpid-types = { path = "../talpid-types" }

mullvad-setup/Cargo.toml

@@ -1,13 +1,12 @@
 use clap::Parser;
+use once_cell::sync::Lazy;
+use std::{path::PathBuf, process, str::FromStr, time::Duration};
+
 use mullvad_api::{self, proxy::ApiConnectionMode, DEVICE_NOT_FOUND};
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_types::version::ParsedAppVersion;
-use once_cell::sync::Lazy;
-use std::{path::PathBuf, process, str::FromStr, time::Duration};
-use talpid_core::{
-    firewall::{self, Firewall},
-    future_retry::{retry_future, ConstantInterval},
-};
+use talpid_core::firewall::{self, Firewall};
+use talpid_future::retry::{retry_future, ConstantInterval};
 use talpid_types::ErrorExt;
 
 static APP_VERSION: Lazy<ParsedAppVersion> =

mullvad-setup/src/main.rs

@@ -11,22 +11,21 @@ rust-version.workspace = true
 workspace = true
 
 [dependencies]
+chrono = { workspace = true, features = ["clock"] }
 err-derive = { workspace = true }
 futures = "0.3.15"
 ipnetwork = "0.16"
-once_cell = { workspace = true }
 libc = "0.2"
 log = { workspace = true }
+once_cell = { workspace = true }
 parking_lot = "0.12.0"
+rand = "0.8.5"
 talpid-routing = { path = "../talpid-routing" }
-talpid-types = { path = "../talpid-types" }
-talpid-time = { path = "../talpid-time" }
-talpid-tunnel-config-client = { path = "../talpid-tunnel-config-client" }
 talpid-tunnel = { path = "../talpid-tunnel" }
+talpid-tunnel-config-client = { path = "../talpid-tunnel-config-client" }
+talpid-types = { path = "../talpid-types" }
 talpid-wireguard = { path = "../talpid-wireguard" }
-chrono = { workspace = true, features = ["clock"] }
 tokio = { workspace = true, features = ["process", "rt-multi-thread", "fs"] }
-rand = "0.8.5"
 
 [target.'cfg(not(target_os="android"))'.dependencies]
 talpid-openvpn = { path = "../talpid-openvpn" }
@@ -47,13 +46,14 @@ duct = "0.13"
 
 
 [target.'cfg(target_os = "macos")'.dependencies]
+async-trait = "0.1"
+duct = "0.13"
 pfctl = "0.4.4"
+subslice = "0.2"
 system-configuration = "0.5.1"
-trust-dns-server = { version = "0.23.0", features = ["resolver"] }
+talpid-time = { path = "../talpid-time" }
 trust-dns-proto = "0.23.0"
-subslice = "0.2"
-async-trait = "0.1"
-duct = "0.13"
+trust-dns-server = { version = "0.23.0", features = ["resolver"] }
 
 
 [target.'cfg(windows)'.dependencies]

talpid-core/Cargo.toml

@@ -35,9 +35,6 @@ pub mod dns;
 /// State machine to handle tunnel configuration.
 pub mod tunnel_state_machine;
 
-/// Future utilities
-pub mod future_retry;
-
 /// Misc utilities for the Linux platform.
 #[cfg(target_os = "linux")]
 mod linux;