|
@@ -30,6 +30,7 @@
|
|
|
#include "circuitlist.h"
|
|
|
#include "dirauth/shared_random.h"
|
|
|
#include "util.h"
|
|
|
+#include "voting_schedule.h"
|
|
|
|
|
|
/** Test the validation of HS v3 addresses */
|
|
|
static void
|
|
@@ -812,7 +813,7 @@ test_time_between_tp_and_srv(void *arg)
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
ret = parse_rfc1123_time("Sat, 26 Oct 1985 01:00:00 UTC", &ns.fresh_until);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
- dirvote_recalculate_timing(get_options(), ns.valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(), ns.valid_after);
|
|
|
ret = hs_in_period_between_tp_and_srv(&ns, 0);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
|
|
@@ -820,7 +821,7 @@ test_time_between_tp_and_srv(void *arg)
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
ret = parse_rfc1123_time("Sat, 26 Oct 1985 12:00:00 UTC", &ns.fresh_until);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
- dirvote_recalculate_timing(get_options(), ns.valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(), ns.valid_after);
|
|
|
ret = hs_in_period_between_tp_and_srv(&ns, 0);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
|
|
@@ -828,7 +829,7 @@ test_time_between_tp_and_srv(void *arg)
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
ret = parse_rfc1123_time("Sat, 26 Oct 1985 13:00:00 UTC", &ns.fresh_until);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
- dirvote_recalculate_timing(get_options(), ns.valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(), ns.valid_after);
|
|
|
ret = hs_in_period_between_tp_and_srv(&ns, 0);
|
|
|
tt_int_op(ret, OP_EQ, 1);
|
|
|
|
|
@@ -836,7 +837,7 @@ test_time_between_tp_and_srv(void *arg)
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
ret = parse_rfc1123_time("Sat, 27 Oct 1985 00:00:00 UTC", &ns.fresh_until);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
- dirvote_recalculate_timing(get_options(), ns.valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(), ns.valid_after);
|
|
|
ret = hs_in_period_between_tp_and_srv(&ns, 0);
|
|
|
tt_int_op(ret, OP_EQ, 1);
|
|
|
|
|
@@ -844,7 +845,7 @@ test_time_between_tp_and_srv(void *arg)
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
ret = parse_rfc1123_time("Sat, 27 Oct 1985 01:00:00 UTC", &ns.fresh_until);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
- dirvote_recalculate_timing(get_options(), ns.valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(), ns.valid_after);
|
|
|
ret = hs_in_period_between_tp_and_srv(&ns, 0);
|
|
|
tt_int_op(ret, OP_EQ, 0);
|
|
|
|
|
@@ -1331,7 +1332,8 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario)
|
|
|
&mock_service_ns->valid_until);
|
|
|
set_consensus_times(cfg->service_valid_until,
|
|
|
&mock_service_ns->fresh_until);
|
|
|
- dirvote_recalculate_timing(get_options(), mock_service_ns->valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(),
|
|
|
+ mock_service_ns->valid_after);
|
|
|
/* Set client consensus time. */
|
|
|
set_consensus_times(cfg->client_valid_after,
|
|
|
&mock_client_ns->valid_after);
|
|
@@ -1339,7 +1341,8 @@ run_reachability_scenario(const reachability_cfg_t *cfg, int num_scenario)
|
|
|
&mock_client_ns->valid_until);
|
|
|
set_consensus_times(cfg->client_valid_until,
|
|
|
&mock_client_ns->fresh_until);
|
|
|
- dirvote_recalculate_timing(get_options(), mock_client_ns->valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(),
|
|
|
+ mock_client_ns->valid_after);
|
|
|
|
|
|
/* New time period checks for this scenario. */
|
|
|
tt_int_op(hs_in_period_between_tp_and_srv(mock_service_ns, 0), OP_EQ,
|
|
@@ -1563,7 +1566,7 @@ helper_set_consensus_and_system_time(networkstatus_t *ns, int position)
|
|
|
} else {
|
|
|
tt_assert(0);
|
|
|
}
|
|
|
- dirvote_recalculate_timing(get_options(), ns->valid_after);
|
|
|
+ voting_schedule_recalculate_timing(get_options(), ns->valid_after);
|
|
|
|
|
|
/* Set system time: pretend to be just 2 minutes before consensus expiry */
|
|
|
real_time = ns->valid_until - 120;
|