diff options
author | David Goulet <dgoulet@torproject.org> | 2018-05-01 11:18:44 -0400 |
---|---|---|
committer | David Goulet <dgoulet@torproject.org> | 2018-05-01 11:43:23 -0400 |
commit | e504b1b35831e9d18be7b89ab471705b41092606 (patch) | |
tree | acedbc4aa31c84266cfe4f6b98a8b85b95c977f1 /src/or/dirauth | |
parent | 711ff6cdf79c32921f587d389b6ac25630a39d80 (diff) | |
download | tor-e504b1b35831e9d18be7b89ab471705b41092606.tar.gz tor-e504b1b35831e9d18be7b89ab471705b41092606.zip |
vote: Namespace functions in voting_schedule.c
Rename them from dirvote_* to voting_schedule_*.
No code behavior change.
Part of #25988
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/dirauth')
-rw-r--r-- | src/or/dirauth/dirvote.c | 5 | ||||
-rw-r--r-- | src/or/dirauth/shared_random.c | 2 | ||||
-rw-r--r-- | src/or/dirauth/shared_random_state.c | 2 |
3 files changed, 5 insertions, 4 deletions
diff --git a/src/or/dirauth/dirvote.c b/src/or/dirauth/dirvote.c index 1d81244137..b67b78cbb9 100644 --- a/src/or/dirauth/dirvote.c +++ b/src/or/dirauth/dirvote.c @@ -4441,8 +4441,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, else last_consensus_interval = options->TestingV3AuthInitialVotingInterval; v3_out->valid_after = - dirvote_get_start_of_next_interval(now, (int)last_consensus_interval, - options->TestingV3AuthVotingStartOffset); + voting_schedule_get_start_of_next_interval(now, + (int)last_consensus_interval, + options->TestingV3AuthVotingStartOffset); format_iso_time(tbuf, v3_out->valid_after); log_notice(LD_DIR,"Choosing valid-after time in vote as %s: " "consensus_set=%d, last_interval=%d", diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c index fcf134aa42..c149328935 100644 --- a/src/or/dirauth/shared_random.c +++ b/src/or/dirauth/shared_random.c @@ -1252,7 +1252,7 @@ sr_act_post_consensus(const networkstatus_t *consensus) } /* Prepare our state so that it's ready for the next voting period. */ - sr_state_update(dirvote_get_next_valid_after_time()); + sr_state_update(voting_schedule_get_next_valid_after_time()); } /* Initialize shared random subsystem. This MUST be called early in the boot diff --git a/src/or/dirauth/shared_random_state.c b/src/or/dirauth/shared_random_state.c index 6b915abcf5..ef5a27ee58 100644 --- a/src/or/dirauth/shared_random_state.c +++ b/src/or/dirauth/shared_random_state.c @@ -1293,7 +1293,7 @@ sr_state_init(int save_to_disk, int read_from_disk) /* We have a state in memory, let's make sure it's updated for the current * and next voting round. */ { - time_t valid_after = dirvote_get_next_valid_after_time(); + time_t valid_after = voting_schedule_get_next_valid_after_time(); sr_state_update(valid_after); } return 0; |