Consider the closest 10 bridges

Author: MarkusPettersson98

mullvad-relay-selector/src/relay_selector/mod.rs

@@ -958,10 +958,8 @@ impl RelaySelector {
         relays: Vec<Relay>,
         location: T,
     ) -> Option<Relay> {
-        /// Minimum number of bridges to keep for selection when filtering by distance.
-        const MIN_BRIDGE_COUNT: usize = 5;
-        /// Max distance of bridges to consider for selection (km).
-        const MAX_BRIDGE_DISTANCE: f64 = 1500f64;
+        /// Minimum number of bridges to keep for selection by distance.
+        const MIN_BRIDGE_COUNT: usize = 10;
         let location = location.into();
 
         #[derive(Clone)]
@@ -979,7 +977,6 @@ impl RelaySelector {
             })
             .sorted_unstable_by_key(|relay| relay.distance as usize)
             .take(MIN_BRIDGE_COUNT)
-            .filter(|relay| relay.distance <= MAX_BRIDGE_DISTANCE)
             .collect();
 
         // Calculate the maximum distance from `location` among the candidates.
@@ -988,7 +985,10 @@ impl RelaySelector {
             .map(|relay| relay.distance)
             .reduce(f64::max)?;
         // Define the weight function to prioritize bridges which are closer to `location`.
-        let weight_fn = |relay: &RelayWithDistance| 1 + (greatest_distance - relay.distance) as u64;
+        // TODO(markus): Finish this document
+        // Penalize bridges ..
+        let weight_fn =
+            |relay: &RelayWithDistance| 1 + (greatest_distance - relay.distance).powi(2) as u64;
 
         helpers::pick_random_relay_weighted(&matching_relays, weight_fn)
             .cloned()