commit 1641c18991bbd58b39c27aae33088bc66b6b5c61 Author: teor <teor@torproject.org> Date: Fri Aug 24 21:20:33 2018 +1000 Remove unused code for setting TestingV3AuthVotingStartOffset Chutney has used TestingV3AuthVotingStartOffset 0 for a few years now. Implements 27298. --- tools/bootstrap-network.sh | 9 --------- torrc_templates/authority.i | 2 -- 2 files changed, 11 deletions(-) diff --git a/tools/bootstrap-network.sh b/tools/bootstrap-network.sh index 49afbd8..b18165e 100755 --- a/tools/bootstrap-network.sh +++ b/tools/bootstrap-network.sh @@ -54,15 +54,6 @@ export CHUTNEY_NETWORK="$CHUTNEY_PATH/networks/$NETWORK_FLAVOUR" echo "$myname: bootstrapping network: $flavour" "$CHUTNEY" configure "$CHUTNEY_NETWORK" -# TODO: Make 'chutney configure' take an optional offset argument and -# use the templating system in Chutney to set this instead of editing -# files like this. -offset=$(expr \( $(date +%s) + $VOTING_OFFSET \) % 300) -CONFOPT="TestingV3AuthVotingStartOffset" -for file in "$CHUTNEY_DATA_DIR"/nodes/*a/torrc ; do - sed -i.bak -e "s/^${CONFOPT}.*$/${CONFOPT} $offset/1" $file -done - "$CHUTNEY" start "$CHUTNEY_NETWORK" sleep 1 "$CHUTNEY" status "$CHUTNEY_NETWORK" diff --git a/torrc_templates/authority.i b/torrc_templates/authority.i index c2a425f..81c6c9d 100644 --- a/torrc_templates/authority.i +++ b/torrc_templates/authority.i @@ -17,5 +17,3 @@ TestingV3AuthInitialVoteDelay 2 V3AuthVoteDelay 2 TestingV3AuthInitialDistDelay 2 V3AuthDistDelay 2 -# This is autoconfigured by chutney, so you probably don't want to use it -#TestingV3AuthVotingStartOffset 0