From 65f05db3dd016a9c1303a3f41005ebd5947fcc9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Em=C4=ABls?= <emils@mullvad.net>
Date: Wed, 7 Feb 2024 00:11:34 +0100
Subject: [PATCH] fixup! Remove unnecessary mutability in AccountsProxy

---
 mullvad-api/src/bin/relay_list.rs    | 41 ----------------------------
 mullvad-api/src/lib.rs               |  4 +--
 mullvad-daemon/src/device/service.rs |  8 +++---
 3 files changed, 6 insertions(+), 47 deletions(-)
 delete mode 100644 mullvad-api/src/bin/relay_list.rs

diff --git a/mullvad-api/src/bin/relay_list.rs b/mullvad-api/src/bin/relay_list.rs
deleted file mode 100644
index c016b4c8a1dd..000000000000
--- a/mullvad-api/src/bin/relay_list.rs
+++ /dev/null
@@ -1,41 +0,0 @@
-//! Fetches and prints the full relay list in JSON.
-//! Used by the installer artifact packer to bundle the latest available
-//! relay list at the time of creating the installer.
-
-use mullvad_api::{self, proxy::ApiConnectionMode, rest::Error as RestError, RelayListProxy};
-use std::process;
-use talpid_types::ErrorExt;
-
-#[tokio::main]
-async fn main() {
-    let runtime = mullvad_api::Runtime::new(tokio::runtime::Handle::current())
-        .expect("Failed to load runtime");
-
-    let relay_list_request = RelayListProxy::new(
-        runtime
-            .mullvad_rest_handle(ApiConnectionMode::Direct.into_repeat())
-            .await,
-    )
-    .relay_list(None)
-    .await;
-
-    let relay_list = match relay_list_request {
-        Ok(relay_list) => relay_list,
-        Err(RestError::TimeoutError) => {
-            eprintln!("Request timed out");
-            process::exit(2);
-        }
-        Err(e @ RestError::DeserializeError(_)) => {
-            eprintln!(
-                "{}",
-                e.display_chain_with_msg("Failed to deserialize relay list")
-            );
-            process::exit(3);
-        }
-        Err(e) => {
-            eprintln!("{}", e.display_chain_with_msg("Failed to fetch relay list"));
-            process::exit(1);
-        }
-    };
-    println!("{}", serde_json::to_string_pretty(&relay_list).unwrap());
-}
diff --git a/mullvad-api/src/lib.rs b/mullvad-api/src/lib.rs
index c28dcfff1b5a..055718214563 100644
--- a/mullvad-api/src/lib.rs
+++ b/mullvad-api/src/lib.rs
@@ -558,7 +558,7 @@ impl AccountsProxy {
 
     #[cfg(target_os = "android")]
     pub fn init_play_purchase(
-        &mut self,
+        &self,
         account: AccountToken,
     ) -> impl Future<Output = Result<PlayPurchasePaymentToken, rest::Error>> {
         #[derive(serde::Deserialize)]
@@ -584,7 +584,7 @@ impl AccountsProxy {
 
     #[cfg(target_os = "android")]
     pub fn verify_play_purchase(
-        &mut self,
+        &self,
         account: AccountToken,
         play_purchase: PlayPurchase,
     ) -> impl Future<Output = Result<(), rest::Error>> {
diff --git a/mullvad-daemon/src/device/service.rs b/mullvad-daemon/src/device/service.rs
index 580d993edc5a..7086adec7449 100644
--- a/mullvad-daemon/src/device/service.rs
+++ b/mullvad-daemon/src/device/service.rs
@@ -262,7 +262,7 @@ pub struct AccountService {
 
 impl AccountService {
     pub fn create_account(&self) -> impl Future<Output = Result<AccountToken, rest::Error>> {
-        let mut proxy = self.proxy.clone();
+        let proxy = self.proxy.clone();
         let api_handle = self.api_availability.clone();
         retry_future(
             move || proxy.create_account(),
@@ -308,7 +308,7 @@ impl AccountService {
         account_token: AccountToken,
         voucher: String,
     ) -> Result<VoucherSubmission, Error> {
-        let mut proxy = self.proxy.clone();
+        let proxy = self.proxy.clone();
         let api_handle = self.api_availability.clone();
         let result = retry_future(
             move || proxy.submit_voucher(account_token.clone(), voucher.clone()),
@@ -328,7 +328,7 @@ impl AccountService {
         &self,
         account_token: AccountToken,
     ) -> Result<PlayPurchasePaymentToken, Error> {
-        let mut proxy = self.proxy.clone();
+        let proxy = self.proxy.clone();
         let api_handle = self.api_availability.clone();
         let result = retry_future(
             move || proxy.init_play_purchase(account_token.clone()),
@@ -349,7 +349,7 @@ impl AccountService {
         account_token: AccountToken,
         play_purchase: PlayPurchase,
     ) -> Result<(), Error> {
-        let mut proxy = self.proxy.clone();
+        let proxy = self.proxy.clone();
         let api_handle = self.api_availability.clone();
         let result = retry_future(
             move || proxy.verify_play_purchase(account_token.clone(), play_purchase.clone()),