From 398007916094cd85e2b072f98e43be7139156b97 Mon Sep 17 00:00:00 2001
From: Markus Pettersson <markus.pettersson@mullvad.net>
Date: Fri, 13 Oct 2023 16:37:21 +0200
Subject: [PATCH] Fix protobuf types

---
 test/test-manager/src/tests/helpers.rs | 2 +-
 test/test-manager/src/tests/install.rs | 7 +++----
 test/test-manager/src/tests/tunnel.rs  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/test/test-manager/src/tests/helpers.rs b/test/test-manager/src/tests/helpers.rs
index 7059a28c7756..2b0cf2ae74cf 100644
--- a/test/test-manager/src/tests/helpers.rs
+++ b/test/test-manager/src/tests/helpers.rs
@@ -305,7 +305,7 @@ pub async fn reset_relay_settings(
     mullvad_client
         .set_obfuscation_settings(types::ObfuscationSettings {
             selected_obfuscation: i32::from(types::obfuscation_settings::SelectedObfuscation::Off),
-            udp2tcp: Some(types::Udp2TcpObfuscationSettings { port: 0 }),
+            udp2tcp: Some(types::Udp2TcpObfuscationSettings { port: None }),
         })
         .await
         .map(|_| ())
diff --git a/test/test-manager/src/tests/install.rs b/test/test-manager/src/tests/install.rs
index 1aeb75a63097..abd105d4dd1a 100644
--- a/test/test-manager/src/tests/install.rs
+++ b/test/test-manager/src/tests/install.rs
@@ -175,10 +175,9 @@ pub async fn test_upgrade_app(ctx: TestContext, rpc: ServiceClient) -> Result<()
                     location:
                         Some(types::LocationConstraint {
                             r#type:
-                                Some(types::location_constraint::Type::Location(types::RelayLocation {
-                                    country,
-                                    ..
-                                })),
+                                Some(types::location_constraint::Type::Location(
+                                    types::GeographicLocationConstraint { country, .. },
+                                )),
                         }),
                     ..
                 })),
diff --git a/test/test-manager/src/tests/tunnel.rs b/test/test-manager/src/tests/tunnel.rs
index 888e9407a42f..84ddce4e57c9 100644
--- a/test/test-manager/src/tests/tunnel.rs
+++ b/test/test-manager/src/tests/tunnel.rs
@@ -145,7 +145,7 @@ pub async fn test_udp2tcp_tunnel(
             selected_obfuscation: i32::from(
                 types::obfuscation_settings::SelectedObfuscation::Udp2tcp,
             ),
-            udp2tcp: Some(types::Udp2TcpObfuscationSettings { port: 0 }),
+            udp2tcp: Some(types::Udp2TcpObfuscationSettings { port: None }),
         })
         .await
         .expect("failed to enable udp2tcp");
@@ -595,7 +595,7 @@ pub async fn test_quantum_resistant_multihop_udp2tcp_tunnel(
             selected_obfuscation: i32::from(
                 types::obfuscation_settings::SelectedObfuscation::Udp2tcp,
             ),
-            udp2tcp: Some(types::Udp2TcpObfuscationSettings { port: 0 }),
+            udp2tcp: Some(types::Udp2TcpObfuscationSettings { port: None }),
         })
         .await
         .expect("Failed to enable obfuscation");