diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-05-18 22:05:35 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-19 07:58:41 -0400 |
| commit | f698b509d8efdc055cfc05c6feaf0aecee41b9d0 (patch) | |
| tree | 7d74711f1ee69f74def145f3517ecee2d69a202a /src/or | |
| parent | d5c70d71027644efb31d16d17b46d43484b46b18 (diff) | |
| download | tor-f698b509d8efdc055cfc05c6feaf0aecee41b9d0.tar.gz tor-f698b509d8efdc055cfc05c6feaf0aecee41b9d0.zip | |
Add unit tests for networkstatus_consensus_is_bootstrapping
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/microdesc.c | 4 | ||||
| -rw-r--r-- | src/or/microdesc.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 299042995b..5b5c29a6d2 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -955,8 +955,8 @@ we_fetch_router_descriptors(const or_options_t *options) } /** Return the consensus flavor we actually want to use to build circuits. */ -int -usable_consensus_flavor(void) +MOCK_IMPL(int, +usable_consensus_flavor,(void)) { if (we_use_microdescriptors_for_circuits(get_options())) { return FLAV_MICRODESC; diff --git a/src/or/microdesc.h b/src/or/microdesc.h index 0675e233d6..40c83139e9 100644 --- a/src/or/microdesc.h +++ b/src/or/microdesc.h @@ -47,7 +47,7 @@ void microdesc_free_all(void); void update_microdesc_downloads(time_t now); void update_microdescs_from_networkstatus(time_t now); -int usable_consensus_flavor(void); +MOCK_DECL(int, usable_consensus_flavor,(void)); int we_fetch_microdescriptors(const or_options_t *options); int we_fetch_router_descriptors(const or_options_t *options); int we_use_microdescriptors_for_circuits(const or_options_t *options); |