Finish renaming digestset_contains to digestset_probably_contains

Since bloom filters are probabilistic, it's nice to make it clear
that the "contains" operation can have false positives.

2 files changed, 5 insertions, 4 deletions

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 9d27d80a84..47e689b5cb 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -1065,7 +1065,7 @@ get_eligible_guards(const or_options_t *options,
           continue;
       }
       ++n_guards;
-      if (digestset_contains(sampled_guard_ids, node->identity))
+      if (digestset_probably_contains(sampled_guard_ids, node->identity))
         continue;
       smartlist_add(eligible_guards, (node_t*)node);
     } SMARTLIST_FOREACH_END(node);
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index a7dda68a56..66967f13f5 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -4116,7 +4116,8 @@ routerlist_remove_old_cached_routers_with_id(time_t now,
     signed_descriptor_t *r_next;
     lifespans[i-lo].idx = i;
     if (r->last_listed_as_valid_until >= now ||
-        (retain && digestset_contains(retain, r->signed_descriptor_digest))) {
+        (retain && digestset_probably_contains(retain,
+                                               r->signed_descriptor_digest))) {
       must_keep[i-lo] = 1;
     }
     if (i < hi) {
@@ -4211,7 +4212,7 @@ routerlist_remove_old_routers(void)
       router = smartlist_get(routerlist->routers, i);
       if (router->cache_info.published_on <= cutoff &&
           router->cache_info.last_listed_as_valid_until < now &&
-          !digestset_contains(retain,
+          !digestset_probably_contains(retain,
                           router->cache_info.signed_descriptor_digest)) {
         /* Too old: remove it.  (If we're a cache, just move it into
          * old_routers.) */
@@ -4232,7 +4233,7 @@ routerlist_remove_old_routers(void)
     sd = smartlist_get(routerlist->old_routers, i);
     if (sd->published_on <= cutoff &&
         sd->last_listed_as_valid_until < now &&
-        !digestset_contains(retain, sd->signed_descriptor_digest)) {
+        !digestset_probably_contains(retain, sd->signed_descriptor_digest)) {
       /* Too old.  Remove it. */
       routerlist_remove_old(routerlist, sd, i--);
     }