Merge branch 'bug5285_v2'

21 files changed, 102 insertions, 96 deletions

diff --git a/changes/rename5285 b/changes/rename5285
new file mode 100644
index 000000000..26ec976e2
--- /dev/null
+++ b/changes/rename5285
@@ -0,0 +1,2 @@
+ o Code simplifications and refactoring:
+   - Rename "isin" functions to "contains", for grammar. Fixes ticket 5285.
diff --git a/src/common/compat.c b/src/common/compat.c
index 0cf7cb3bf..3b15f8ad2 100644
--- a/src/common/compat.c
+++ b/src/common/compat.c
@@ -2758,7 +2758,7 @@ tor_cond_wait(tor_cond_t *cond, tor_mutex_t *mutex)
   EnterCriticalSection(&cond->mutex);
 
   tor_assert(WaitForSingleObject(event, 0) == WAIT_TIMEOUT);
-  tor_assert(!smartlist_isin(cond->events, event));
+  tor_assert(!smartlist_contains(cond->events, event));
   smartlist_add(cond->events, event);
 
   LeaveCriticalSection(&cond->mutex);
diff --git a/src/common/container.c b/src/common/container.c
index cf3ca8b24..eec497a3e 100644
--- a/src/common/container.c
+++ b/src/common/container.c
@@ -163,7 +163,7 @@ smartlist_string_remove(smartlist_t *sl, const char *element)
 /** Return true iff some element E of sl has E==element.
  */
 int
-smartlist_isin(const smartlist_t *sl, const void *element)
+smartlist_contains(const smartlist_t *sl, const void *element)
 {
   int i;
   for (i=0; i < sl->num_used; i++)
@@ -176,7 +176,7 @@ smartlist_isin(const smartlist_t *sl, const void *element)
  * !strcmp(E,<b>element</b>)
  */
 int
-smartlist_string_isin(const smartlist_t *sl, const char *element)
+smartlist_contains_string(const smartlist_t *sl, const char *element)
 {
   int i;
   if (!sl) return 0;
@@ -203,7 +203,7 @@ smartlist_string_pos(const smartlist_t *sl, const char *element)
  * !strcasecmp(E,<b>element</b>)
  */
 int
-smartlist_string_isin_case(const smartlist_t *sl, const char *element)
+smartlist_contains_string_case(const smartlist_t *sl, const char *element)
 {
   int i;
   if (!sl) return 0;
@@ -217,11 +217,11 @@ smartlist_string_isin_case(const smartlist_t *sl, const char *element)
  * to the decimal encoding of <b>num</b>.
  */
 int
-smartlist_string_num_isin(const smartlist_t *sl, int num)
+smartlist_contains_int_as_string(const smartlist_t *sl, int num)
 {
   char buf[32]; /* long enough for 64-bit int, and then some. */
   tor_snprintf(buf,sizeof(buf),"%d", num);
-  return smartlist_string_isin(sl, buf);
+  return smartlist_contains_string(sl, buf);
 }
 
 /** Return true iff the two lists contain the same strings in the same
@@ -247,7 +247,7 @@ smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2)
  * tor_memeq(E,<b>element</b>,DIGEST_LEN)
  */
 int
-smartlist_digest_isin(const smartlist_t *sl, const char *element)
+smartlist_contains_digest(const smartlist_t *sl, const char *element)
 {
   int i;
   if (!sl) return 0;
@@ -257,19 +257,19 @@ smartlist_digest_isin(const smartlist_t *sl, const char *element)
   return 0;
 }
 
-/** Return true iff some element E of sl2 has smartlist_isin(sl1,E).
+/** Return true iff some element E of sl2 has smartlist_contains(sl1,E).
  */
 int
 smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2)
 {
   int i;
   for (i=0; i < sl2->num_used; i++)
-    if (smartlist_isin(sl1, sl2->list[i]))
+    if (smartlist_contains(sl1, sl2->list[i]))
       return 1;
   return 0;
 }
 
-/** Remove every element E of sl1 such that !smartlist_isin(sl2,E).
+/** Remove every element E of sl1 such that !smartlist_contains(sl2,E).
  * Does not preserve the order of sl1.
  */
 void
@@ -277,13 +277,13 @@ smartlist_intersect(smartlist_t *sl1, const smartlist_t *sl2)
 {
   int i;
   for (i=0; i < sl1->num_used; i++)
-    if (!smartlist_isin(sl2, sl1->list[i])) {
+    if (!smartlist_contains(sl2, sl1->list[i])) {
       sl1->list[i] = sl1->list[--sl1->num_used]; /* swap with the end */
       i--; /* so we process the new i'th element */
     }
 }
 
-/** Remove every element E of sl1 such that smartlist_isin(sl2,E).
+/** Remove every element E of sl1 such that smartlist_contains(sl2,E).
  * Does not preserve the order of sl1.
  */
 void
diff --git a/src/common/container.h b/src/common/container.h
index d204fa4cc..e247fb7ea 100644
--- a/src/common/container.h
+++ b/src/common/container.h
@@ -35,13 +35,13 @@ void smartlist_remove(smartlist_t *sl, const void *element);
 void *smartlist_pop_last(smartlist_t *sl);
 void smartlist_reverse(smartlist_t *sl);
 void smartlist_string_remove(smartlist_t *sl, const char *element);
-int smartlist_isin(const smartlist_t *sl, const void *element);
-int smartlist_string_isin(const smartlist_t *sl, const char *element);
+int smartlist_contains(const smartlist_t *sl, const void *element);
+int smartlist_contains_string(const smartlist_t *sl, const char *element);
 int smartlist_string_pos(const smartlist_t *, const char *elt);
-int smartlist_string_isin_case(const smartlist_t *sl, const char *element);
-int smartlist_string_num_isin(const smartlist_t *sl, int num);
+int smartlist_contains_string_case(const smartlist_t *sl, const char *element);
+int smartlist_contains_int_as_string(const smartlist_t *sl, int num);
 int smartlist_strings_eq(const smartlist_t *sl1, const smartlist_t *sl2);
-int smartlist_digest_isin(const smartlist_t *sl, const char *element);
+int smartlist_contains_digest(const smartlist_t *sl, const char *element);
 int smartlist_overlap(const smartlist_t *sl1, const smartlist_t *sl2);
 void smartlist_intersect(smartlist_t *sl1, const smartlist_t *sl2);
 void smartlist_subtract(smartlist_t *sl1, const smartlist_t *sl2);
@@ -623,7 +623,7 @@ digestset_add(digestset_t *set, const char *digest)
 /** If <b>digest</b> is in <b>set</b>, return nonzero.  Otherwise,
  * <em>probably</em> return zero. */
 static INLINE int
-digestset_isin(const digestset_t *set, const char *digest)
+digestset_contains(const digestset_t *set, const char *digest)
 {
   const uint32_t *p = (const uint32_t *)digest;
   const uint32_t d1 = p[0] + (p[1]>>16);
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index fffdde909..b98624386 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -2301,7 +2301,7 @@ circuit_all_predicted_ports_handled(time_t now, int *need_uptime,
   enough = (smartlist_len(sl) == 0);
   for (i = 0; i < smartlist_len(sl); ++i) {
     port = smartlist_get(sl, i);
-    if (smartlist_string_num_isin(LongLivedServices, *port))
+    if (smartlist_contains_int_as_string(LongLivedServices, *port))
       *need_uptime = 1;
     tor_free(port);
   }
diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c
index 81f6831ce..b8f71bd34 100644
--- a/src/or/circuitlist.c
+++ b/src/or/circuitlist.c
@@ -1611,10 +1611,10 @@ assert_circuit_ok(const circuit_t *c)
   }
   if (c->state == CIRCUIT_STATE_CHAN_WAIT && !c->marked_for_close) {
     tor_assert(circuits_pending_chans &&
-               smartlist_isin(circuits_pending_chans, c));
+               smartlist_contains(circuits_pending_chans, c));
   } else {
     tor_assert(!circuits_pending_chans ||
-               !smartlist_isin(circuits_pending_chans, c));
+               !smartlist_contains(circuits_pending_chans, c));
   }
   if (origin_circ && origin_circ->cpath) {
     assert_cpath_ok(origin_circ->cpath);
diff --git a/src/or/circuituse.c b/src/or/circuituse.c
index b94b60216..83734c9d6 100644
--- a/src/or/circuituse.c
+++ b/src/or/circuituse.c
@@ -804,7 +804,8 @@ circuit_stream_is_being_handled(entry_connection_t *conn,
   const node_t *exitnode;
   int num=0;
   time_t now = time(NULL);
-  int need_uptime = smartlist_string_num_isin(get_options()->LongLivedPorts,
+  int need_uptime = smartlist_contains_int_as_string(
+                                   get_options()->LongLivedPorts,
                                    conn ? conn->socks_request->port : port);
 
   for (circ=global_circuitlist;circ;circ = circ->next) {
@@ -1621,7 +1622,7 @@ circuit_get_open_circ_or_launch(entry_connection_t *conn,
   want_onehop = conn->want_onehop;
 
   need_uptime = !conn->want_onehop && !conn->use_begindir &&
-                smartlist_string_num_isin(options->LongLivedPorts,
+                smartlist_contains_int_as_string(options->LongLivedPorts,
                                           conn->socks_request->port);
 
   if (desired_circuit_purpose != CIRCUIT_PURPOSE_C_GENERAL)
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 0964c423d..a68a5cf42 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -829,9 +829,10 @@ static int
 consider_plaintext_ports(entry_connection_t *conn, uint16_t port)
 {
   const or_options_t *options = get_options();
-  int reject = smartlist_string_num_isin(options->RejectPlaintextPorts, port);
+  int reject = smartlist_contains_int_as_string(
+                                     options->RejectPlaintextPorts, port);
 
-  if (smartlist_string_num_isin(options->WarnPlaintextPorts, port)) {
+  if (smartlist_contains_int_as_string(options->WarnPlaintextPorts, port)) {
     log_warn(LD_APP, "Application request to port %d: this port is "
              "commonly used for unencrypted protocols. Please make sure "
              "you don't send anything you would mind the rest of the "
diff --git a/src/or/dirvote.c b/src/or/dirvote.c
index dcc242079..0731426d9 100644
--- a/src/or/dirvote.c
+++ b/src/or/dirvote.c
@@ -3110,7 +3110,7 @@ dirvote_compute_consensuses(void)
   }
   tor_assert(pending_vote_list);
   SMARTLIST_FOREACH(pending_vote_list, pending_vote_t *, v, {
-    if (smartlist_string_isin(v->vote->known_flags, "Running"))
+    if (smartlist_contains_string(v->vote->known_flags, "Running"))
       n_vote_running++;
   });
   if (!n_vote_running) {
diff --git a/src/or/dns.c b/src/or/dns.c
index 556dd1e28..68309a80d 100644
--- a/src/or/dns.c
+++ b/src/or/dns.c
@@ -1218,7 +1218,7 @@ is_test_address(const char *address)
 {
   const or_options_t *options = get_options();
   return options->ServerDNSTestAddresses &&
-    smartlist_string_isin_case(options->ServerDNSTestAddresses, address);
+    smartlist_contains_string_case(options->ServerDNSTestAddresses, address);
 }
 
 /** Called on the OR side when the eventdns library tells us the outcome of a
@@ -1843,7 +1843,7 @@ wildcard_increment_answer(const char *id)
 
   if (*ip > 5 && n_wildcard_requests > 10) {
     if (!dns_wildcard_list) dns_wildcard_list = smartlist_new();
-    if (!smartlist_string_isin(dns_wildcard_list, id)) {
+    if (!smartlist_contains_string(dns_wildcard_list, id)) {
     log(dns_wildcard_notice_given ? LOG_INFO : LOG_NOTICE, LD_EXIT,
         "Your DNS provider has given \"%s\" as an answer for %d different "
         "invalid addresses. Apparently they are hijacking DNS failures. "
@@ -1866,7 +1866,8 @@ add_wildcarded_test_address(const char *address)
   if (!dns_wildcarded_test_address_list)
     dns_wildcarded_test_address_list = smartlist_new();
 
-  if (smartlist_string_isin_case(dns_wildcarded_test_address_list, address))
+  if (smartlist_contains_string_case(dns_wildcarded_test_address_list,
+                                     address))
     return;
 
   n_test_addrs = get_options()->ServerDNSTestAddresses ?
@@ -2104,7 +2105,7 @@ dns_reset_correctness_checks(void)
 static int
 answer_is_wildcarded(const char *ip)
 {
-  return dns_wildcard_list && smartlist_string_isin(dns_wildcard_list, ip);
+  return dns_wildcard_list && smartlist_contains_string(dns_wildcard_list, ip);
 }
 
 /** Exit with an assertion if <b>resolve</b> is corrupt. */
diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index 035f3ca8c..3e5837164 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -762,7 +762,7 @@ entry_guards_set_from_config(const or_options_t *options)
                     smartlist_add(entry_fps, (void*)node->identity));
 
   SMARTLIST_FOREACH(entry_guards, entry_guard_t *, e, {
-    if (smartlist_digest_isin(entry_fps, e->identity))
+    if (smartlist_contains_digest(entry_fps, e->identity))
       smartlist_add(old_entry_guards_on_list, e);
     else
       smartlist_add(old_entry_guards_not_on_list, e);
@@ -901,7 +901,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory,
       }
       if (node == chosen_exit)
         continue; /* don't pick the same node for entry and exit */
-      if (consider_exit_family && smartlist_isin(exit_family, node))
+      if (consider_exit_family && smartlist_contains(exit_family, node))
         continue; /* avoid relays that are family members of our exit */
 #if 0 /* since EntryNodes is always strict now, this clause is moot */
       if (options->EntryNodes &&
diff --git a/src/or/main.c b/src/or/main.c
index 10ee0d7ee..1dd207a75 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -422,7 +422,7 @@ connection_unlink(connection_t *conn)
 void
 add_connection_to_closeable_list(connection_t *conn)
 {
-  tor_assert(!smartlist_isin(closeable_connection_lst, conn));
+  tor_assert(!smartlist_contains(closeable_connection_lst, conn));
   tor_assert(conn->marked_for_close);
   assert_connection_ok(conn, time(NULL));
   smartlist_add(closeable_connection_lst, conn);
@@ -432,14 +432,14 @@ add_connection_to_closeable_list(connection_t *conn)
 int
 connection_is_on_closeable_list(connection_t *conn)
 {
-  return smartlist_isin(closeable_connection_lst, conn);
+  return smartlist_contains(closeable_connection_lst, conn);
 }
 
 /** Return true iff conn is in the current poll array. */
 int
 connection_in_array(connection_t *conn)
 {
-  return smartlist_isin(connection_array, conn);
+  return smartlist_contains(connection_array, conn);
 }
 
 /** Set <b>*array</b> to an array of all connections, and <b>*n</b>
@@ -666,7 +666,7 @@ connection_start_reading_from_linked_conn(connection_t *conn)
       tor_event_base_loopexit(tor_libevent_get_base(), &tv);
     }
   } else {
-    tor_assert(smartlist_isin(active_linked_connection_lst, conn));
+    tor_assert(smartlist_contains(active_linked_connection_lst, conn));
   }
 }
 
@@ -686,7 +686,7 @@ connection_stop_reading_from_linked_conn(connection_t *conn)
      * so let's leave it alone for now. */
     smartlist_remove(active_linked_connection_lst, conn);
   } else {
-    tor_assert(!smartlist_isin(active_linked_connection_lst, conn));
+    tor_assert(!smartlist_contains(active_linked_connection_lst, conn));
   }
 }
 
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c
index 22b5b8b93..79dd706c4 100644
--- a/src/or/networkstatus.c
+++ b/src/or/networkstatus.c
@@ -774,7 +774,7 @@ router_set_networkstatus_v2(const char *s, time_t arrived_at,
   }
 
   if (requested_fingerprints) {
-    if (smartlist_string_isin(requested_fingerprints, fp)) {
+    if (smartlist_contains_string(requested_fingerprints, fp)) {
       smartlist_string_remove(requested_fingerprints, fp);
     } else {
       if (source != NS_FROM_DIR_ALL) {
diff --git a/src/or/policies.c b/src/or/policies.c
index d8200ae75..f9a03aef2 100644
--- a/src/or/policies.c
+++ b/src/or/policies.c
@@ -374,7 +374,7 @@ addr_is_in_cc_list(uint32_t addr, const smartlist_t *cc_list)
   tor_addr_from_ipv4h(&tar, addr);
   country = geoip_get_country_by_addr(&tar);
   name = geoip_get_country_name(country);
-  return smartlist_string_isin_case(cc_list, name);
+  return smartlist_contains_string_case(cc_list, name);
 }
 
 /** Return 1 if <b>addr</b>:<b>port</b> is permitted to publish to our
diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 6da9ba469..6ffa4f8f9 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -931,7 +931,7 @@ rend_service_requires_uptime(rend_service_t *service)
 
   for (i=0; i < smartlist_len(service->ports); ++i) {
     p = smartlist_get(service->ports, i);
-    if (smartlist_string_num_isin(get_options()->LongLivedPorts,
+    if (smartlist_contains_int_as_string(get_options()->LongLivedPorts,
                                   p->virtual_port))
       return 1;
   }
@@ -2774,7 +2774,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
       char *hs_dir_ip;
       const node_t *node;
       hs_dir = smartlist_get(responsible_dirs, j);
-      if (smartlist_digest_isin(renddesc->successful_uploads,
+      if (smartlist_contains_digest(renddesc->successful_uploads,
                                 hs_dir->identity_digest))
         /* Don't upload descriptor if we succeeded in doing so last time. */
         continue;
@@ -2809,7 +2809,8 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
                hs_dir->or_port);
       tor_free(hs_dir_ip);
       /* Remember successful upload to this router for next time. */
-      if (!smartlist_digest_isin(successful_uploads, hs_dir->identity_digest))
+      if (!smartlist_contains_digest(successful_uploads,
+                                     hs_dir->identity_digest))
         smartlist_add(successful_uploads, hs_dir->identity_digest);
     }
     smartlist_clear(responsible_dirs);
@@ -2827,7 +2828,7 @@ directory_post_to_hs_dir(rend_service_descriptor_t *renddesc,
     if (!renddesc->successful_uploads)
       renddesc->successful_uploads = smartlist_new();
     SMARTLIST_FOREACH(successful_uploads, const char *, c, {
-      if (!smartlist_digest_isin(renddesc->successful_uploads, c)) {
+      if (!smartlist_contains_digest(renddesc->successful_uploads, c)) {
         char *hsdir_id = tor_memdup(c, DIGEST_LEN);
         smartlist_add(renddesc->successful_uploads, hsdir_id);
       }
diff --git a/src/or/router.c b/src/or/router.c
index 1057973db..c584d6277 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1858,7 +1858,7 @@ router_rebuild_descriptor(int force)
          member = node_get_by_nickname(name, 1);
        if (!member) {
          int is_legal = is_legal_nickname_or_hexdigest(name);
-         if (!smartlist_string_isin(warned_nonexistent_family, name) &&
+         if (!smartlist_contains_string(warned_nonexistent_family, name) &&
              !is_legal_hexdigest(name)) {
            if (is_legal)
              log_warn(LD_CONFIG,
@@ -1884,7 +1884,7 @@ router_rebuild_descriptor(int force)
          base16_encode(fp+1,HEX_DIGEST_LEN+1,
                        member->identity, DIGEST_LEN);
          smartlist_add(ri->declared_family, fp);
-         if (smartlist_string_isin(warned_nonexistent_family, name))
+         if (smartlist_contains_string(warned_nonexistent_family, name))
            smartlist_string_remove(warned_nonexistent_family, name);
        }
     skip:
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 6d509f3d3..b294bfa08 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -541,7 +541,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now)
     int found = 0;
     if (!(ds->type & V3_DIRINFO))
       continue;
-    if (smartlist_digest_isin(missing_digests, ds->v3_identity_digest))
+    if (smartlist_contains_digest(missing_digests, ds->v3_identity_digest))
       continue;
     cl = get_cert_list(ds->v3_identity_digest);
     SMARTLIST_FOREACH(cl->certs, authority_cert_t *, cert, {
@@ -3327,7 +3327,7 @@ 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_isin(retain, r->signed_descriptor_digest))) {
+        (retain && digestset_contains(retain, r->signed_descriptor_digest))) {
       must_keep[i-lo] = 1;
     }
     if (i < hi) {
@@ -3461,7 +3461,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_isin(retain,
+          !digestset_contains(retain,
                           router->cache_info.signed_descriptor_digest)) {
         /* Too old: remove it.  (If we're a cache, just move it into
          * old_routers.) */
@@ -3482,7 +3482,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_isin(retain, sd->signed_descriptor_digest)) {
+        !digestset_contains(retain, sd->signed_descriptor_digest)) {
       /* Too old.  Remove it. */
       routerlist_remove_old(routerlist, sd, i--);
     }
@@ -3661,7 +3661,7 @@ router_load_routers_from_string(const char *s, const char *eos,
                       ri->cache_info.signed_descriptor_digest :
                       ri->cache_info.identity_digest,
                     DIGEST_LEN);
-      if (smartlist_string_isin(requested_fingerprints, fp)) {
+      if (smartlist_contains_string(requested_fingerprints, fp)) {
         smartlist_string_remove(requested_fingerprints, fp);
       } else {
         char *requested =
diff --git a/src/or/transports.c b/src/or/transports.c
index 7903fb723..647b29316 100644
--- a/src/or/transports.c
+++ b/src/or/transports.c
@@ -428,7 +428,7 @@ static void
 add_transport_to_proxy(const char *transport, managed_proxy_t *mp)
 {
   tor_assert(mp->transports_to_launch);
-  if (!smartlist_string_isin(mp->transports_to_launch, transport))
+  if (!smartlist_contains_string(mp->transports_to_launch, transport))
     smartlist_add(mp->transports_to_launch, tor_strdup(transport));
 }
 
@@ -453,7 +453,7 @@ proxy_needs_restart(const managed_proxy_t *mp)
     goto needs_restart;
 
   SMARTLIST_FOREACH_BEGIN(mp->transports, const transport_t *, t) {
-    if (!smartlist_string_isin(mp->transports_to_launch, t->name))
+    if (!smartlist_contains_string(mp->transports_to_launch, t->name))
       goto needs_restart;
 
   } SMARTLIST_FOREACH_END(t);
diff --git a/src/test/bench.c b/src/test/bench.c
index 3cad61e62..d57aeb81a 100644
--- a/src/test/bench.c
+++ b/src/test/bench.c
@@ -309,18 +309,18 @@ bench_dmap(void)
          NANOCOUNT(pt3, pt4, iters*elts));
 
   for (i = 0; i < iters; ++i) {
-    SMARTLIST_FOREACH(sl, const char *, cp, n += digestset_isin(ds, cp));
-    SMARTLIST_FOREACH(sl2, const char *, cp, n += digestset_isin(ds, cp));
+    SMARTLIST_FOREACH(sl, const char *, cp, n += digestset_contains(ds, cp));
+    SMARTLIST_FOREACH(sl2, const char *, cp, n += digestset_contains(ds, cp));
   }
   end = perftime();
-  printf("digestset_isin: %.2f ns per element.\n",
+  printf("digestset_contains: %.2f ns per element.\n",
          NANOCOUNT(pt4, end, iters*elts*2));
   /* We need to use this, or else the whole loop gets optimized out. */
   printf("Hits == %d\n", n);
 
   for (i = 0; i < fpostests; ++i) {
     crypto_rand(d, 20);
-    if (digestset_isin(ds, d)) ++fp;
+    if (digestset_contains(ds, d)) ++fp;
   }
   printf("False positive rate on digestset: %.2f%%\n",
          (fp/(double)fpostests)*100);
diff --git a/src/test/test_containers.c b/src/test/test_containers.c
index d66ebb62d..ca901624c 100644
--- a/src/test/test_containers.c
+++ b/src/test/test_containers.c
@@ -66,8 +66,8 @@ test_container_smartlist_basic(void)
   test_eq(4, smartlist_len(sl));
 
   /* test isin. */
-  test_assert(smartlist_isin(sl, (void*)3));
-  test_assert(!smartlist_isin(sl, (void*)99));
+  test_assert(smartlist_contains(sl, (void*)3));
+  test_assert(!smartlist_contains(sl, (void*)99));
 
  done:
   smartlist_free(sl);
@@ -195,13 +195,13 @@ test_container_smartlist_strings(void)
   tor_free(cp_alloc);
   smartlist_shuffle(sl);
   test_eq(7, smartlist_len(sl));
-  test_assert(smartlist_string_isin(sl, "and"));
-  test_assert(smartlist_string_isin(sl, "router"));
-  test_assert(smartlist_string_isin(sl, "by"));
-  test_assert(smartlist_string_isin(sl, "nickm"));
-  test_assert(smartlist_string_isin(sl, "onion"));
-  test_assert(smartlist_string_isin(sl, "arma"));
-  test_assert(smartlist_string_isin(sl, "the"));
+  test_assert(smartlist_contains_string(sl, "and"));
+  test_assert(smartlist_contains_string(sl, "router"));
+  test_assert(smartlist_contains_string(sl, "by"));
+  test_assert(smartlist_contains_string(sl, "nickm"));
+  test_assert(smartlist_contains_string(sl, "onion"));
+  test_assert(smartlist_contains_string(sl, "arma"));
+  test_assert(smartlist_contains_string(sl, "the"));
 
   /* Test bsearch. */
   smartlist_sort(sl, compare_strs_);
@@ -278,13 +278,13 @@ test_container_smartlist_strings(void)
   test_streq(cp_alloc, "50,a,canal,man,noon,panama,plan,radar");
   tor_free(cp_alloc);
 
-  /* Test string_isin and isin_case and num_isin */
-  test_assert(smartlist_string_isin(sl, "noon"));
-  test_assert(!smartlist_string_isin(sl, "noonoon"));
-  test_assert(smartlist_string_isin_case(sl, "nOOn"));
-  test_assert(!smartlist_string_isin_case(sl, "nooNooN"));
-  test_assert(smartlist_string_num_isin(sl, 50));
-  test_assert(!smartlist_string_num_isin(sl, 60));
+  /* Test contains_string, contains_string_case and contains_int_as_string */
+  test_assert(smartlist_contains_string(sl, "noon"));
+  test_assert(!smartlist_contains_string(sl, "noonoon"));
+  test_assert(smartlist_contains_string_case(sl, "nOOn"));
+  test_assert(!smartlist_contains_string_case(sl, "nooNooN"));
+  test_assert(smartlist_contains_int_as_string(sl, 50));
+  test_assert(!smartlist_contains_int_as_string(sl, 60));
 
   /* Test smartlist_choose */
   {
@@ -292,12 +292,12 @@ test_container_smartlist_strings(void)
     int allsame = 1;
     int allin = 1;
     void *first = smartlist_choose(sl);
-    test_assert(smartlist_isin(sl, first));
+    test_assert(smartlist_contains(sl, first));
     for (i = 0; i < 100; ++i) {
       void *second = smartlist_choose(sl);
       if (second != first)
         allsame = 0;
-      if (!smartlist_isin(sl, second))
+      if (!smartlist_contains(sl, second))
         allin = 0;
     }
     test_assert(!allsame);
@@ -365,15 +365,15 @@ test_container_smartlist_overlap(void)
   smartlist_add_all(sl, odds);
   smartlist_intersect(sl, primes);
   test_eq(smartlist_len(sl), 3);
-  test_assert(smartlist_isin(sl, (void*)3));
-  test_assert(smartlist_isin(sl, (void*)5));
-  test_assert(smartlist_isin(sl, (void*)7));
+  test_assert(smartlist_contains(sl, (void*)3));
+  test_assert(smartlist_contains(sl, (void*)5));
+  test_assert(smartlist_contains(sl, (void*)7));
 
   /* subtract */
   smartlist_add_all(sl, primes);
   smartlist_subtract(sl, odds);
   test_eq(smartlist_len(sl), 1);
-  test_assert(smartlist_isin(sl, (void*)2));
+  test_assert(smartlist_contains(sl, (void*)2));
 
  done:
   smartlist_free(odds);
@@ -389,14 +389,14 @@ test_container_smartlist_digests(void)
 {
   smartlist_t *sl = smartlist_new();
 
-  /* digest_isin. */
+  /* contains_digest */
   smartlist_add(sl, tor_memdup("AAAAAAAAAAAAAAAAAAAA", DIGEST_LEN));
   smartlist_add(sl, tor_memdup("\00090AAB2AAAAaasdAAAAA", DIGEST_LEN));
   smartlist_add(sl, tor_memdup("\00090AAB2AAAAaasdAAAAA", DIGEST_LEN));
-  test_eq(0, smartlist_digest_isin(NULL, "AAAAAAAAAAAAAAAAAAAA"));
-  test_assert(smartlist_digest_isin(sl, "AAAAAAAAAAAAAAAAAAAA"));
-  test_assert(smartlist_digest_isin(sl, "\00090AAB2AAAAaasdAAAAA"));
-  test_eq(0, smartlist_digest_isin(sl, "\00090AAB2AAABaasdAAAAA"));
+  test_eq(0, smartlist_contains_digest(NULL, "AAAAAAAAAAAAAAAAAAAA"));
+  test_assert(smartlist_contains_digest(sl, "AAAAAAAAAAAAAAAAAAAA"));
+  test_assert(smartlist_contains_digest(sl, "\00090AAB2AAAAaasdAAAAA"));
+  test_eq(0, smartlist_contains_digest(sl, "\00090AAB2AAABaasdAAAAA"));
 
   /* sort digests */
   smartlist_sort_digests(sl);
@@ -445,11 +445,11 @@ test_container_smartlist_join(void)
   } SMARTLIST_FOREACH_JOIN_END(cp1, cp2);
 
   SMARTLIST_FOREACH(sl3, const char *, cp,
-                    test_assert(smartlist_isin(sl2, cp) &&
-                                !smartlist_string_isin(sl, cp)));
+                    test_assert(smartlist_contains(sl2, cp) &&
+                                !smartlist_contains_string(sl, cp)));
   SMARTLIST_FOREACH(sl4, const char *, cp,
-                    test_assert(smartlist_isin(sl, cp) &&
-                                smartlist_string_isin(sl2, cp)));
+                    test_assert(smartlist_contains(sl, cp) &&
+                                smartlist_contains_string(sl2, cp)));
   joined = smartlist_join_strings(sl3, ",", 0, NULL);
   test_streq(joined, "Anemias,Anemias,Crossbowmen,Work");
   tor_free(joined);
@@ -528,18 +528,18 @@ test_container_digestset(void)
   }
   set = digestset_new(1000);
   SMARTLIST_FOREACH(included, const char *, cp,
-                    if (digestset_isin(set, cp))
+                    if (digestset_contains(set, cp))
                       ok = 0);
   test_assert(ok);
   SMARTLIST_FOREACH(included, const char *, cp,
                     digestset_add(set, cp));
   SMARTLIST_FOREACH(included, const char *, cp,
-                    if (!digestset_isin(set, cp))
+                    if (!digestset_contains(set, cp))
                       ok = 0);
   test_assert(ok);
   for (i = 0; i < 1000; ++i) {
     crypto_rand(d, DIGEST_LEN);
-    if (digestset_isin(set, d))
+    if (digestset_contains(set, d))
       ++false_positives;
   }
   test_assert(false_positives < 50); /* Should be far lower. */
diff --git a/src/test/test_util.c b/src/test/test_util.c
index b2e5ab1d5..ad214b9e6 100644
--- a/src/test/test_util.c
+++ b/src/test/test_util.c
@@ -2215,13 +2215,13 @@ test_util_listdir(void *ptr)
   dir_contents = tor_listdir(dirname);
   test_assert(dir_contents);
   /* make sure that each filename is listed. */
-  test_assert(smartlist_string_isin_case(dir_contents, "hopscotch"));
-  test_assert(smartlist_string_isin_case(dir_contents, "mumblety-peg"));
-  test_assert(smartlist_string_isin_case(dir_contents, ".hidden-file"));
-  test_assert(smartlist_string_isin_case(dir_contents, "some-directory"));
+  test_assert(smartlist_contains_string_case(dir_contents, "hopscotch"));
+  test_assert(smartlist_contains_string_case(dir_contents, "mumblety-peg"));
+  test_assert(smartlist_contains_string_case(dir_contents, ".hidden-file"));
+  test_assert(smartlist_contains_string_case(dir_contents, "some-directory"));
 
-  test_assert(!smartlist_string_isin(dir_contents, "."));
-  test_assert(!smartlist_string_isin(dir_contents, ".."));
+  test_assert(!smartlist_contains_string(dir_contents, "."));
+  test_assert(!smartlist_contains_string(dir_contents, ".."));
 
  done:
   tor_free(fname1);