[tor-commits] [metrics-web/master] Consider all bwauth* consensus params to be valid.

[karsten at torproject.org]

commit 6aec8a94f60c70da9d187952093cc5024fa1e7f7
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Mon Dec 5 14:48:25 2011 +0100

    Consider all bwauth* consensus params to be valid.
    
    Once the set of bwauth-related consensus parameters has stabilized we
    should put in just the valid parameters.  But updating the set every two
    weeks doesn't help anyone.
---
 src/org/torproject/chc/Checker.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/org/torproject/chc/Checker.java b/src/org/torproject/chc/Checker.java
index c7a2d00..02c70b7 100644
--- a/src/org/torproject/chc/Checker.java
+++ b/src/org/torproject/chc/Checker.java
@@ -179,9 +179,8 @@ public class Checker {
         ("circwindow,CircuitPriorityHalflifeMsec,refuseunknownexits,"
         + "cbtdisabled,cbtnummodes,cbtrecentcount,cbtmaxtimeouts,"
         + "cbtmincircs,cbtquantile,cbtclosequantile,cbttestfreq,"
-        + "cbtmintimeout,cbtinitialtimeout,perconnbwburst,perconnbwrate,"
-        + "bwauthpid,bwauthbestratio,bwauthcircs,bwauthkp,bwauthtd,"
-        + "bwauthti,bwauthtidecay,bwauthdescbw").split(",")));
+        + "cbtmintimeout,cbtinitialtimeout,perconnbwburst,perconnbwrate").
+        split(",")));
     SortedSet<String> conflicts = new TreeSet<String>();
     for (Status vote : this.downloadedVotes) {
       Map<String, String> voteConsensusParams =
@@ -194,7 +193,8 @@ public class Checker {
               e.getKey()) ||
               !downloadedConsensus.getConsensusParams().get(e.getKey()).
               equals(e.getValue()) ||
-              !validParameters.contains(e.getKey())) {
+              (!validParameters.contains(e.getKey()) &&
+              !e.getKey().startsWith("bwauth"))) {
             StringBuilder message = new StringBuilder();
             message.append(vote.getNickname());
             for (Map.Entry<String, String> p :