diff options
author | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:33:26 -0500 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-01-18 15:33:26 -0500 |
commit | a31a5581eecc900c9e3d7be78ea06a3ea7fe32a3 (patch) | |
tree | fc475732e4a79904fa7f42bd4c369f82b153fd12 /src/test/test_entrynodes.c | |
parent | 472b277207219d791a399d4d449af6ffdf00a081 (diff) | |
download | tor-a31a5581eecc900c9e3d7be78ea06a3ea7fe32a3.tar.gz tor-a31a5581eecc900c9e3d7be78ea06a3ea7fe32a3.zip |
Remove UseDeprecatedGuardAlgorithm.
Diffstat (limited to 'src/test/test_entrynodes.c')
-rw-r--r-- | src/test/test_entrynodes.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 2e7abd1e00..772ecaa275 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -789,17 +789,6 @@ test_entry_guard_get_guard_selection_by_name(void *arg) tt_assert(gs3 != gs1); tt_assert(gs3 == get_guard_selection_info()); - or_options_t *options = get_options_mutable(); - options->UseDeprecatedGuardAlgorithm = 1; - update_guard_selection_choice(options); - guard_selection_t *gs4 = get_guard_selection_info(); - tt_assert(gs4 != gs3); - tt_assert(gs4 == get_guard_selection_by_name("legacy", GS_TYPE_LEGACY, 1)); - - options->UseDeprecatedGuardAlgorithm = 0; - update_guard_selection_choice(options); - tt_assert(gs3 == get_guard_selection_info()); - done: entry_guards_free_all(); } @@ -824,14 +813,6 @@ test_entry_guard_choose_selection_initial(void *arg) tt_int_op(type, OP_EQ, GS_TYPE_BRIDGE); get_options_mutable()->UseBridges = 0; - /* If we're using legacy guards, we get the legacy selection */ - get_options_mutable()->UseDeprecatedGuardAlgorithm = 1; - name = choose_guard_selection(get_options(), - dummy_consensus, NULL, &type); - tt_str_op(name, OP_EQ, "legacy"); - tt_int_op(type, OP_EQ, GS_TYPE_LEGACY); - get_options_mutable()->UseDeprecatedGuardAlgorithm = 0; - /* If we discard >99% of our guards, though, we should be in the restricted * set. */ tt_assert(get_options_mutable()->EntryNodes == NULL); |