Fixed based on feedback

Author: Pururun

mullvad-relay-selector/tests/relay_selector.rs

@@ -391,7 +391,7 @@ fn test_wireguard_retry_order() {
     let relay_selector = default_relay_selector();
     for (retry_attempt, query) in WIREGUARD_RETRY_ORDER.iter().enumerate() {
         let relay = relay_selector
-            .get_relay(retry_attempt, talpid_types::net::IpAvailability::IpV6)
+            .get_relay(retry_attempt, talpid_types::net::IpAvailability::IpV4AndIpV6)
             .unwrap_or_else(|_| panic!("Retry attempt {retry_attempt} did not yield any relay"));
         // For each relay, cross-check that the it has the expected tunnel protocol
         let tunnel_type = tunnel_type(&unwrap_relay(relay.clone()));
@@ -450,7 +450,7 @@ fn test_openvpn_retry_order() {
 
     for (retry_attempt, query) in OPENVPN_RETRY_ORDER.iter().enumerate() {
         let relay = relay_selector
-            .get_relay(retry_attempt, talpid_types::net::IpAvailability::IpV6)
+            .get_relay(retry_attempt, talpid_types::net::IpAvailability::IpV4AndIpV6)
             .unwrap_or_else(|_| panic!("Retry attempt {retry_attempt} did not yield any relay"));
         // For each relay, cross-check that the it has the expected tunnel protocol
         let tunnel_type = tunnel_type(&unwrap_relay(relay.clone()));

talpid-types/src/net/mod.rs

@@ -572,7 +572,7 @@ pub fn all_of_the_internet() -> Vec<ipnetwork::IpNetwork> {
 pub enum Connectivity {
     /// Host is offline
     Offline,
-    /// The connectivity status is unknown, but persumed to be online
+    /// The connectivity status is unknown, but presumed to be online
     PresumeOnline,
     /// Host is online with the given IP versions available
     Online(IpAvailability),
@@ -597,7 +597,7 @@ impl Connectivity {
     /// If no IP4 nor IPv6 routes exist, we have no way of reaching the internet
     /// so we consider ourselves offline.
     pub fn is_offline(&self) -> bool {
-        matches!(self, Connectivity::Offline)
+        self == Connectivity::Offline
     }
 
     /// Whether IPv4 connectivity seems to be available on the host.