[tor-commits] [chutney/master] Refactor authority.i timings

[teor at torproject.org]

commit bd124134399d07f9cb3a614ee2fc2f9e1e782803
Author: teor <teor at torproject.org>
Date:   Sat Aug 25 07:24:55 2018 +1000

    Refactor authority.i timings
    
    Preparation for 27300.
---
 torrc_templates/authority.i | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/torrc_templates/authority.i b/torrc_templates/authority.i
index 81c6c9d..5519500 100644
--- a/torrc_templates/authority.i
+++ b/torrc_templates/authority.i
@@ -2,18 +2,20 @@ AuthoritativeDirectory 1
 V3AuthoritativeDirectory 1
 ContactInfo auth${nodenum}@test.test
 
-# Speed up the consensus cycle as fast as it will go
-# Voting Interval can be:
-#   10, 12, 15, 18, 20, 24, 25, 30, 36, 40, 45, 50, 60, ...
-# Testing Initial Voting Interval can be:
-#    5,  6,  8,  9, or any of the possible values for Voting Interval,
-# as they both need to evenly divide 30 minutes.
-# If clock desynchronisation is an issue, use an interval of at least:
-#   18 * drift in seconds, to allow for a clock slop factor
+# Speed up the consensus cycle as fast as it will go.
+# If clock desynchronisation is an issue, increase these voting times.
+
+# V3AuthVotingInterval and TestingV3AuthInitialVotingInterval can be:
+#   10, 12, 15, 18, 20, ...
+# TestingV3AuthInitialVotingInterval can also be:
+#    5, 6, 8, 9
+# They both need to evenly divide 24 hours.
+
+# Testing Vote + Testing Dist must be less than Testing Interval
 TestingV3AuthInitialVotingInterval 5
-V3AuthVotingInterval 10
-# VoteDelay + DistDelay must be less than VotingInterval
 TestingV3AuthInitialVoteDelay 2
-V3AuthVoteDelay 2
 TestingV3AuthInitialDistDelay 2
+# Vote + Dist must be less than Interval/2
+V3AuthVotingInterval 10
+V3AuthVoteDelay 2
 V3AuthDistDelay 2