fixup

mullvad-cli/src/cmds/bridge.rs

@@ -1,4 +1,4 @@
-use anyhow::{anyhow, Result};
+use anyhow::Result;
 use clap::Subcommand;
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_types::{
@@ -172,13 +172,8 @@ impl Bridge {
                 Self::update_bridge_settings(&mut rpc, Some(location), None, None).await
             }
             SetCommands::CustomList { custom_list_name } => {
-                let list = rpc
-                    .get_settings()
-                    .await?
-                    .custom_lists
-                    .into_iter()
-                    .find(|list| list.name == custom_list_name)
-                    .ok_or(anyhow!("Custom list not found"))?;
+                let list =
+                    super::custom_list::find_list_by_name(&mut rpc, &custom_list_name).await?;
                 let location =
                     Constraint::Only(LocationConstraint::CustomList { list_id: list.id });
                 Self::update_bridge_settings(&mut rpc, Some(location), None, None).await

mullvad-cli/src/cmds/custom_list.rs

@@ -6,7 +6,6 @@ use anyhow::{anyhow, Result};
 use clap::Subcommand;
 use mullvad_management_interface::MullvadProxyClient;
 use mullvad_types::{
-    custom_list::CustomList as CustomListType,
     relay_constraints::{Constraint, GeographicLocationConstraint},
     relay_list::RelayList,
 };
@@ -96,7 +95,7 @@ impl CustomList {
     /// If the list does not exist, print an error.
     async fn get(name: String) -> Result<()> {
         let mut rpc = MullvadProxyClient::new().await?;
-        let custom_list = Self::get_list_by_name(&mut rpc, &name).await?;
+        let custom_list = find_list_by_name(&mut rpc, &name).await?;
         let cache = rpc.get_relay_locations().await?;
         Self::print_custom_list_content(&custom_list, &cache);
         Ok(())
@@ -117,7 +116,7 @@ impl CustomList {
 
         let mut rpc = MullvadProxyClient::new().await?;
 
-        let mut list = Self::get_list_by_name(&mut rpc, &name).await?;
+        let mut list = find_list_by_name(&mut rpc, &name).await?;
         list.locations.insert(location);
         rpc.update_custom_list(list).await?;
 
@@ -131,7 +130,7 @@ impl CustomList {
 
         let mut rpc = MullvadProxyClient::new().await?;
 
-        let mut list = Self::get_list_by_name(&mut rpc, &name).await?;
+        let mut list = find_list_by_name(&mut rpc, &name).await?;
         list.locations.remove(&location);
         rpc.update_custom_list(list).await?;
 
@@ -147,22 +146,13 @@ impl CustomList {
     async fn rename_list(name: String, new_name: String) -> Result<()> {
         let mut rpc = MullvadProxyClient::new().await?;
 
-        let mut list = Self::get_list_by_name(&mut rpc, &name).await?;
+        let mut list = find_list_by_name(&mut rpc, &name).await?;
         list.name = new_name;
         rpc.update_custom_list(list).await?;
 
         Ok(())
     }
 
-    async fn get_list_by_name(rpc: &mut MullvadProxyClient, name: &str) -> Result<CustomListType> {
-        rpc.get_settings()
-            .await?
-            .custom_lists
-            .into_iter()
-            .find(|list| list.name == name)
-            .ok_or(anyhow!("List not found"))
-    }
-
     fn print_custom_list(custom_list: &mullvad_types::custom_list::CustomList, cache: &RelayList) {
         println!("{}", custom_list.name);
         Self::print_custom_list_content(custom_list, cache);
@@ -242,3 +232,15 @@ impl<'a> std::fmt::Display for GeographicLocationConstraintFormatter<'a> {
         }
     }
 }
+
+pub async fn find_list_by_name(
+    rpc: &mut MullvadProxyClient,
+    name: &str,
+) -> Result<mullvad_types::custom_list::CustomList> {
+    rpc.get_settings()
+        .await?
+        .custom_lists
+        .into_iter()
+        .find(|list| list.name == name)
+        .ok_or(anyhow!("List not found"))
+}

mullvad-cli/src/cmds/relay.rs

@@ -516,13 +516,8 @@ impl Relay {
 
     async fn set_custom_list(custom_list_name: String) -> Result<()> {
         let mut rpc = MullvadProxyClient::new().await?;
-        let list_id = rpc
-            .get_settings()
+        let list_id = super::custom_list::find_list_by_name(&mut rpc, &custom_list_name)
             .await?
-            .custom_lists
-            .into_iter()
-            .find(|list| list.name == custom_list_name)
-            .ok_or(anyhow!("Custom list not found"))?
             .id;
         rpc.update_relay_settings(RelaySettingsUpdate::Normal(RelayConstraintsUpdate {
             location: Some(Constraint::Only(LocationConstraint::CustomList { list_id })),
@@ -624,13 +619,8 @@ impl Relay {
                     };
             }
             Some(EntryLocation::CustomList { custom_list_name }) => {
-                let list_id = rpc
-                    .get_settings()
+                let list_id = super::custom_list::find_list_by_name(&mut rpc, &custom_list_name)
                     .await?
-                    .custom_lists
-                    .into_iter()
-                    .find(|list| list.name == custom_list_name)
-                    .ok_or(anyhow!("Custom list not found"))?
                     .id;
                 wireguard_constraints.entry_location =
                     Constraint::Only(LocationConstraint::CustomList { list_id });

mullvad-cli/src/main.rs

@@ -115,7 +115,7 @@ enum Cli {
 
     /// Manage custom lists
     #[clap(subcommand)]
-    CustomList(custom_lists::CustomList),
+    CustomList(custom_list::CustomList),
 }
 
 #[tokio::main]

mullvad-daemon/src/custom_list.rs

@@ -64,7 +64,13 @@ where
     }
 
     pub async fn delete_custom_list(&mut self, id: Id) -> Result<(), Error> {
-        let Some((list_index, _)) = self.settings.custom_lists.iter().enumerate().find(|elem| elem.1.id == id) else {
+        let Some((list_index, _)) = self
+            .settings
+            .custom_lists
+            .iter()
+            .enumerate()
+            .find(|elem| elem.1.id == id)
+        else {
             return Err(Error::ListNotFound);
         };
         let settings_changed = self
@@ -96,7 +102,13 @@ where
     }
 
     pub async fn update_custom_list(&mut self, new_list: CustomList) -> Result<(), Error> {
-        let Some((list_index, old_list)) = self.settings.custom_lists.iter().enumerate().find(|elem| elem.1.id == new_list.id) else {
+        let Some((list_index, old_list)) = self
+            .settings
+            .custom_lists
+            .iter()
+            .enumerate()
+            .find(|elem| elem.1.id == new_list.id)
+        else {
             return Err(Error::ListNotFound);
         };
         let id = old_list.id;

mullvad-daemon/src/management_interface.rs

@@ -16,7 +16,6 @@ use mullvad_paths;
 use mullvad_types::settings::DnsOptions;
 use mullvad_types::{
     account::AccountToken,
-    custom_list,
     relay_constraints::{BridgeSettings, BridgeState, ObfuscationSettings, RelaySettingsUpdate},
     relay_list::RelayList,
     settings::Settings,