From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 5 Oct 2023 12:25:01 +0000 (-0400)
Subject: Remove MIN_METHOD_FOR_MIDDLEONLY
X-Git-Tag: tor-0.4.9.1-alpha~100^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5b80a8f509ca7fbc8d141acc754685439519fcf1;p=thirdparty%2Ftor.git

Remove MIN_METHOD_FOR_MIDDLEONLY
---

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 36025b88a9..2839c6db15 100644
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -2129,7 +2129,7 @@ networkstatus_compute_consensus(smartlist_t *votes,
       /* Starting with consensus method 32, we handle the middle-only
        * flag specially: when it is present, we clear some flags, and
        * set others. */
-      if (is_middle_only && consensus_method >= MIN_METHOD_FOR_MIDDLEONLY) {
+      if (is_middle_only) {
         remove_flag(chosen_flags, "Exit");
         remove_flag(chosen_flags, "V2Dir");
         remove_flag(chosen_flags, "Guard");
diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h
index 4790180256..6ac07f171a 100644
--- a/src/feature/dirauth/dirvote.h
+++ b/src/feature/dirauth/dirvote.h
@@ -55,10 +55,6 @@
 /** The highest consensus method that we currently support. */
 #define MAX_SUPPORTED_CONSENSUS_METHOD 34
 
-/** Lowest consensus method for which we handle the MiddleOnly flag specially.
- */
-#define MIN_METHOD_FOR_MIDDLEONLY 32
-
 /**
  * Lowest consensus method for which we suppress the published time in
  * microdescriptor consensuses.