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 functions that checked for pre-ipv6 consensus.

Browse Source 
We no longer need or need to test:
  * node_awaiting_ipv6()
  * networkstatus_consensus_has_ipv6().
This commit is contained in:
Nick Mathewson
2020-01-15 11:26:14 -05:00
parent 8d94bcbf8c
commit ceacda44f1
4 changed files with 1 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/test_dir.c
-88
View File
@@ -7065,93 +7065,6 @@ test_dir_platform_str(void *arg)
;
}
static networkstatus_t *mock_networkstatus;
static networkstatus_t *
mock_networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f)
{
(void)f;
return mock_networkstatus;
}
static void
test_dir_networkstatus_consensus_has_ipv6(void *arg)
{
(void)arg;
int has_ipv6 = 0;
/* Init options and networkstatus */
or_options_t our_options;
mock_options = &our_options;
reset_options(mock_options, &mock_get_options_calls);
MOCK(get_options, mock_get_options);
networkstatus_t our_networkstatus;
mock_networkstatus = &our_networkstatus;
memset(mock_networkstatus, 0, sizeof(*mock_networkstatus));
MOCK(networkstatus_get_latest_consensus_by_flavor,
mock_networkstatus_get_latest_consensus_by_flavor);
/* A live consensus */
mock_networkstatus->valid_after = time(NULL) - 3600;
mock_networkstatus->valid_until = time(NULL) + 3600;
/* Test the bounds for A lines in the NS consensus */
mock_options->UseMicrodescriptors = 0;
mock_networkstatus->consensus_method = MIN_SUPPORTED_CONSENSUS_METHOD;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
/* Test the bounds for A lines in the microdesc consensus */
mock_options->UseMicrodescriptors = 1;
mock_networkstatus->consensus_method =
MIN_SUPPORTED_CONSENSUS_METHOD;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
mock_networkstatus->consensus_method = MAX_SUPPORTED_CONSENSUS_METHOD + 20;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
mock_networkstatus->consensus_method =
MIN_SUPPORTED_CONSENSUS_METHOD + 1;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
mock_networkstatus->consensus_method =
MIN_SUPPORTED_CONSENSUS_METHOD + 20;
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_SUPPORTED_CONSENSUS_METHOD;
/* Reasonably live */
mock_networkstatus->valid_until = approx_time() - 60;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(has_ipv6);
/* Not reasonably live */
mock_networkstatus->valid_after = approx_time() - 24*60*60 - 3600;
mock_networkstatus->valid_until = approx_time() - 24*60*60 - 60;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(!has_ipv6);
/* NULL consensus */
mock_networkstatus = NULL;
has_ipv6 = networkstatus_consensus_has_ipv6(get_options());
tt_assert(!has_ipv6);
done:
UNMOCK(get_options);
UNMOCK(networkstatus_get_latest_consensus_by_flavor);
}
static void
test_dir_format_versions_list(void *arg)
{
@@ -7290,7 +7203,6 @@ struct testcase_t dir_tests[] = {
DIR(matching_flags, 0),
DIR(networkstatus_compute_bw_weights_v10, 0),
DIR(platform_str, 0),
DIR(networkstatus_consensus_has_ipv6, TT_FORK),
DIR(format_versions_list, TT_FORK),
END_OF_TESTCASES
};