commit e203a158046b6dcd746b1ba47581211018dd5830 Author: teor teor@riseup.net Date: Mon May 18 13:36:28 2020 +1000

Revert an unintended change to wait times

And explain that we're waiting for bridges --- lib/chutney/TorNet.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py index e089fce..2eef368 100644 --- a/lib/chutney/TorNet.py +++ b/lib/chutney/TorNet.py @@ -986,6 +986,7 @@ class LocalNodeController(NodeController): # future version series (for example, 0.5, 1.0, and 22.0) MIN_TOR_VERSION_FOR_MICRODESC_FIX = 'Tor 0.4'

+ # TODO: delete all this unused code, once we're sure it's not needed MIN_TIME_FOR_COMPLETE_CONSENSUS = V3_AUTH_VOTING_INTERVAL*1.5 MIN_START_TIME_LEGACY = 0 MIN_START_TIME_RECENT = 0 @@ -1013,7 +1014,10 @@ class LocalNodeController(NodeController): else: return LocalNodeController.MIN_START_TIME_RECENT

- NODE_WAIT_FOR_UNCHECKED_DIR_INFO = 0 + # We don't check for bridge descriptors before verifying + # TODO: make this check specific to bridges + NODE_WAIT_FOR_UNCHECKED_DIR_INFO = 10 + # We don't check for onion service descriptors before verifying HS_WAIT_FOR_UNCHECKED_DIR_INFO = V3_AUTH_VOTING_INTERVAL + 10

def getUncheckedDirInfoWaitTime(self):