Remove "Any" tunnel protocol from query builder

5 files changed, 16 insertions, 26 deletions

diff --git a/test/test-manager/src/tests/audits/mul_02_002.rs b/test/test-manager/src/tests/audits/mul_02_002.rs
index c0571eaacc..a03afd91b9 100644
--- a/test/test-manager/src/tests/audits/mul_02_002.rs
+++ b/test/test-manager/src/tests/audits/mul_02_002.rs
@@ -36,8 +36,7 @@ pub async fn test_mul_02_002(
     // Step 1 - Choose a relay
     constrain_to_relay(
         &mut mullvad_client,
-        RelayQueryBuilder::new()
-            .openvpn()
+        RelayQueryBuilder::openvpn()
             .transport_protocol(TransportProtocol::Tcp)
             .port(443)
             .build(),
diff --git a/test/test-manager/src/tests/daita.rs b/test/test-manager/src/tests/daita.rs
index 91687002aa..fb699fde7f 100644
--- a/test/test-manager/src/tests/daita.rs
+++ b/test/test-manager/src/tests/daita.rs
@@ -61,7 +61,7 @@ pub async fn test_daita(
     log::info!("Selected non-daita relay: {}", non_daita_relay.hostname);
 
     log::info!("Setting wireguard and DAITA");
-    let wireguard_query = RelayQueryBuilder::new().wireguard().build();
+    let wireguard_query = RelayQueryBuilder::wireguard().build();
     helpers::apply_settings_from_relay_query(&mut mullvad_client, wireguard_query.clone()).await?;
     mullvad_client.set_enable_daita(true).await?;
 
diff --git a/test/test-manager/src/tests/tunnel.rs b/test/test-manager/src/tests/tunnel.rs
index 72d1b97188..9f9b16b7b6 100644
--- a/test/test-manager/src/tests/tunnel.rs
+++ b/test/test-manager/src/tests/tunnel.rs
@@ -96,7 +96,7 @@ pub async fn test_wireguard_tunnel(
     for (port, should_succeed) in PORTS {
         log::info!("Connect to WireGuard endpoint on port {port}");
 
-        let query = RelayQueryBuilder::new().wireguard().port(port).build();
+        let query = RelayQueryBuilder::wireguard().port(port).build();
 
         apply_settings_from_relay_query(&mut mullvad_client, query)
             .await
@@ -130,7 +130,7 @@ pub async fn test_udp2tcp_tunnel(
     rpc: ServiceClient,
     mut mullvad_client: MullvadProxyClient,
 ) -> Result<(), Error> {
-    let query = RelayQueryBuilder::new().wireguard().udp2tcp().build();
+    let query = RelayQueryBuilder::wireguard().udp2tcp().build();
 
     apply_settings_from_relay_query(&mut mullvad_client, query).await?;
 
@@ -180,7 +180,7 @@ pub async fn test_wireguard_over_shadowsocks(
     rpc: ServiceClient,
     mut mullvad_client: MullvadProxyClient,
 ) -> anyhow::Result<()> {
-    let query = RelayQueryBuilder::new().wireguard().shadowsocks().build();
+    let query = RelayQueryBuilder::wireguard().shadowsocks().build();
 
     apply_settings_from_relay_query(&mut mullvad_client, query).await?;
 
@@ -212,7 +212,7 @@ pub async fn test_bridge(
     //
     log::info!("Updating bridge settings");
 
-    let query = RelayQueryBuilder::new().openvpn().bridge().build();
+    let query = RelayQueryBuilder::openvpn().bridge().build();
 
     apply_settings_from_relay_query(&mut mullvad_client, query).await?;
 
@@ -279,7 +279,7 @@ pub async fn test_multihop(
     rpc: ServiceClient,
     mut mullvad_client: MullvadProxyClient,
 ) -> Result<(), Error> {
-    let query = RelayQueryBuilder::new().wireguard().multihop().build();
+    let query = RelayQueryBuilder::wireguard().multihop().build();
 
     apply_settings_from_relay_query(&mut mullvad_client, query).await?;
 
@@ -437,7 +437,7 @@ pub async fn test_quantum_resistant_tunnel(
 
     log::info!("Setting tunnel protocol to WireGuard");
 
-    let query = RelayQueryBuilder::new().wireguard().build();
+    let query = RelayQueryBuilder::wireguard().build();
 
     apply_settings_from_relay_query(&mut mullvad_client, query).await?;
 
@@ -503,11 +503,7 @@ pub async fn test_quantum_resistant_multihop_udp2tcp_tunnel(
         .await
         .expect("Failed to enable PQ tunnels");
 
-    let query = RelayQueryBuilder::new()
-        .wireguard()
-        .multihop()
-        .udp2tcp()
-        .build();
+    let query = RelayQueryBuilder::wireguard().multihop().udp2tcp().build();
 
     apply_settings_from_relay_query(&mut mullvad_client, query).await?;
 
@@ -538,8 +534,7 @@ pub async fn test_quantum_resistant_multihop_shadowsocks_tunnel(
         .await
         .context("Failed to enable PQ tunnels")?;
 
-    let query = RelayQueryBuilder::new()
-        .wireguard()
+    let query = RelayQueryBuilder::wireguard()
         .multihop()
         .shadowsocks()
         .build();
diff --git a/test/test-manager/src/tests/tunnel_state.rs b/test/test-manager/src/tests/tunnel_state.rs
index 4005f76480..60f266721e 100644
--- a/test/test-manager/src/tests/tunnel_state.rs
+++ b/test/test-manager/src/tests/tunnel_state.rs
@@ -343,11 +343,9 @@ pub async fn test_connected_state(
 
     // Set relay to use
     log::info!("Select relay");
-    let relay = helpers::constrain_to_relay(
-        &mut mullvad_client,
-        RelayQueryBuilder::new().wireguard().build(),
-    )
-    .await?;
+    let relay =
+        helpers::constrain_to_relay(&mut mullvad_client, RelayQueryBuilder::wireguard().build())
+            .await?;
 
     // Connect
     connect_and_wait(&mut mullvad_client).await?;
diff --git a/test/test-manager/src/tests/ui.rs b/test/test-manager/src/tests/ui.rs
index 0ffdf1748f..8518d94a36 100644
--- a/test/test-manager/src/tests/ui.rs
+++ b/test/test-manager/src/tests/ui.rs
@@ -94,11 +94,9 @@ pub async fn test_ui_tunnel_settings(
 ) -> anyhow::Result<()> {
     // tunnel-state.spec precondition: a single WireGuard relay should be selected
     log::info!("Select WireGuard relay");
-    let entry = helpers::constrain_to_relay(
-        &mut mullvad_client,
-        RelayQueryBuilder::new().wireguard().build(),
-    )
-    .await?;
+    let entry =
+        helpers::constrain_to_relay(&mut mullvad_client, RelayQueryBuilder::wireguard().build())
+            .await?;
 
     let ui_result = run_test_env(
         &rpc,