torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove support for now-obsolete consensus methods before 28.

Browse Source 
Closes ticket 32695.
This commit is contained in:
Nick Mathewson
2020-01-09 12:41:56 -05:00
parent e45810113b
commit 441a048a3a
6 changed files with 19 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_dir.c
+4 -9
View File
@@ -7108,7 +7108,7 @@ test_dir_networkstatus_consensus_has_ipv6(void *arg)
mock_options->UseMicrodescriptors = 1;
mock_networkstatus->consensus_method =
MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS;
MIN_SUPPORTED_CONSENSUS_METHOD;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
@@ -7117,24 +7117,19 @@ test_dir_networkstatus_consensus_has_ipv6(void *arg)
tt_assert(has_ipv6);
mock_networkstatus->consensus_method =
MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS + 1;
MIN_SUPPORTED_CONSENSUS_METHOD + 1;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
mock_networkstatus->consensus_method =
MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS + 20;
MIN_SUPPORTED_CONSENSUS_METHOD + 20;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
mock_networkstatus->consensus_method =
MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS - 1;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(!has_ipv6);
/* Test the edge cases */
mock_options->UseMicrodescriptors = 1;
mock_networkstatus->consensus_method =
MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS;
MIN_SUPPORTED_CONSENSUS_METHOD;
/* Reasonably live */
mock_networkstatus->valid_until = approx_time() - 60;