[tor-commits] [tor/master] entrynodes: Better naming for dir info check functions.

[nickm at torproject.org]

commit f7306b16ecaeb07eb64d0fcbfcc43754533818c2
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Oct 3 15:50:54 2017 +0300

    entrynodes: Better naming for dir info check functions.
---
 src/or/entrynodes.c        | 7 ++++---
 src/or/entrynodes.h        | 4 ++--
 src/or/nodelist.c          | 2 +-
 src/test/test_entrynodes.c | 5 +++--
 4 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c
index c71a93bea..9fbf42643 100644
--- a/src/or/entrynodes.c
+++ b/src/or/entrynodes.c
@@ -3446,7 +3446,7 @@ guards_retry_optimistic(const or_options_t *options)
  * the genreal descriptor information <b>using_mds</b>, <b>num_present</b> and
  * <b>num_usable</b> to improve the error message. */
 char *
-guard_selection_get_dir_info_status_str(guard_selection_t *gs,
+guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs,
                                         int using_mds,
                                         int num_present, int num_usable)
 {
@@ -3492,10 +3492,11 @@ guard_selection_get_dir_info_status_str(guard_selection_t *gs,
 /** As guard_selection_have_enough_dir_info_to_build_circuits, but uses
  * the default guard selection. */
 char *
-entry_guards_get_dir_info_status_str(int using_mds,
+entry_guards_get_err_str_if_dir_info_missing(int using_mds,
                                      int num_present, int num_usable)
 {
-  return guard_selection_get_dir_info_status_str(get_guard_selection_info(),
+  return guard_selection_get_err_str_if_dir_info_missing(
+                                                 get_guard_selection_info(),
                                                  using_mds,
                                                  num_present, num_usable);
 }
diff --git a/src/or/entrynodes.h b/src/or/entrynodes.h
index ca9fb489e..9e1e72993 100644
--- a/src/or/entrynodes.h
+++ b/src/or/entrynodes.h
@@ -572,9 +572,9 @@ int getinfo_helper_entry_guards(control_connection_t *conn,
 int entries_known_but_down(const or_options_t *options);
 void entries_retry_all(const or_options_t *options);
 
-char *entry_guards_get_dir_info_status_str(int using_mds,
+char *entry_guards_get_err_str_if_dir_info_missing(int using_mds,
                                            int num_present, int num_usable);
-char *guard_selection_get_dir_info_status_str(guard_selection_t *gs,
+char *guard_selection_get_err_str_if_dir_info_missing(guard_selection_t *gs,
                                               int using_mds,
                                               int num_present, int num_usable);
 
diff --git a/src/or/nodelist.c b/src/or/nodelist.c
index 6ca9bd6d4..eae74e18b 100644
--- a/src/or/nodelist.c
+++ b/src/or/nodelist.c
@@ -2325,7 +2325,7 @@ update_router_have_minimum_dir_info(void)
   }
 
   { /* Check entry guard dirinfo status */
-    char *guard_error = entry_guards_get_dir_info_status_str(using_md,
+    char *guard_error = entry_guards_get_err_str_if_dir_info_missing(using_md,
                                                              num_present,
                                                              num_usable);
     if (guard_error) {
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c
index 472383f38..f9d981953 100644
--- a/src/test/test_entrynodes.c
+++ b/src/test/test_entrynodes.c
@@ -1643,7 +1643,8 @@ test_entry_guard_manage_primary(void *arg)
   {
     /* Check that we have all required dirinfo for the primaries (that's done
      * in big_fake_network_setup()) */
-    char *dir_info_str = guard_selection_get_dir_info_status_str(gs, 0, 0, 0);
+    char *dir_info_str =
+      guard_selection_get_err_str_if_dir_info_missing(gs, 0, 0, 0);
     tt_assert(!dir_info_str);
 
     /* Now artificially remove the first primary's descriptor and re-check */
@@ -1652,7 +1653,7 @@ test_entry_guard_manage_primary(void *arg)
     /* Change the first primary's identity digest so that the mocked functions
      * can't find its descriptor */
     memset(first_primary->identity, 9, sizeof(first_primary->identity));
-    dir_info_str = guard_selection_get_dir_info_status_str(gs, 1, 2, 3);
+    dir_info_str =guard_selection_get_err_str_if_dir_info_missing(gs, 1, 2, 3);
     tt_str_op(dir_info_str, OP_EQ,
               "We're missing descriptors for 1/2 of our primary entry guards "
               "(total microdescriptors: 2/3).");