aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2024-03-12 09:11:35 -0400
committerNick Mathewson <nickm@torproject.org>2024-03-12 09:43:14 -0400
commit41f2d6237777d53f335dbf8cd29f8fc98605efea (patch)
tree6a442b98eb7a299dad531774704d3809774afab1
parent628eaab8ca3ce8116352b76b856c0cde46ea54d4 (diff)
downloadarti-41f2d6237777d53f335dbf8cd29f8fc98605efea.tar.gz
arti-41f2d6237777d53f335dbf8cd29f8fc98605efea.zip
Rename and clarify result_is_relaxed.
-rw-r--r--crates/tor-relay-selection/src/selector.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/crates/tor-relay-selection/src/selector.rs b/crates/tor-relay-selection/src/selector.rs
index d6145aef0..6c2d056d8 100644
--- a/crates/tor-relay-selection/src/selector.rs
+++ b/crates/tor-relay-selection/src/selector.rs
@@ -95,9 +95,9 @@ impl<'a> SelectionInfo<'a> {
self.succeeded
}
- /// Return true if we had to relax our initial selector in order to get
- /// relays.
- pub fn result_is_relaxed(&self) -> bool {
+ /// Return true if picked at least one relay,
+ /// but only after relaxing our initial selector.
+ pub fn result_is_relaxed_success(&self) -> bool {
self.relaxed_try.is_some() && self.succeeded
}
}
@@ -483,14 +483,14 @@ mod test {
// Select one relay; make sure it is ok.
let (r_rand, si) = sel.select_relay(&mut rng, &nd);
assert!(si.success());
- assert!(!si.result_is_relaxed());
+ assert!(!si.result_is_relaxed_success());
assert!(p(r_rand.unwrap()));
// Select 20 random relays; make sure they are distinct and ok.
let (rs_rand, si) = sel.select_n_relays(&mut rng, 20, &nd);
assert_eq!(rs_rand.len(), 20);
assert!(si.success());
- assert!(!si.result_is_relaxed());
+ assert!(!si.result_is_relaxed_success());
assert!(rs_rand.iter().cloned().all(p));
let k_got: HashSet<_> = rs_rand.iter().map(|r| r.rsa_identity().unwrap()).collect();
assert_eq!(k_got.len(), 20);