Remove dir_port from RouterStatusBuilder

crates/tor-netdoc/src/doc/netstatus/build.rs

@@ -416,7 +416,6 @@ mod test {
             .identity([155; 20].into())
             .add_or_port(SocketAddr::from(([10, 0, 0, 60], 9100)))
             .add_or_port("[f00f::1]:9200".parse().unwrap())
-            .dir_port(66)
             .doc_digest([99; 32])
             .set_flags(RelayFlags::FAST)
             .add_flags(RelayFlags::STABLE | RelayFlags::V2DIR)

crates/tor-netdoc/src/doc/netstatus/rs.rs

@@ -37,9 +37,6 @@ struct GenericRouterStatus<D> {
     /// Declared OR port for this relay.
     #[allow(dead_code)] // This value is never used; we look at addrs instead.
     or_port: u16,
-    /// Declared directory port for this relay.
-    #[allow(dead_code)] // Arti doesn't use this value.
-    dir_port: u16,
     /// Digest of the document for this relay.
     doc_digest: D,
     /// Flags applied by the authorities to this relay.
@@ -156,7 +153,7 @@ where
         };
         let ipv4addr = r_item.required_arg(4 + skip)?.parse::<net::Ipv4Addr>()?;
         let or_port = r_item.required_arg(5 + skip)?.parse::<u16>()?;
-        let dir_port = r_item.required_arg(6 + skip)?.parse::<u16>()?;
+        let _ = r_item.required_arg(6 + skip)?.parse::<u16>()?;
 
         let mut addrs: Vec<net::SocketAddr> = vec![net::SocketAddr::V4(net::SocketAddrV4::new(
             ipv4addr, or_port,
@@ -206,7 +203,6 @@ where
             identity,
             addrs,
             or_port,
-            dir_port,
             doc_digest,
             flags,
             version,

crates/tor-netdoc/src/doc/netstatus/rs/build.rs

@@ -24,8 +24,6 @@ pub struct RouterStatusBuilder<D> {
     identity: Option<RsaIdentity>,
     /// See [`GenericRouterStatus::addrs`].
     addrs: Vec<SocketAddr>,
-    /// See [`GenericRouterStatus::dir_port`].
-    dir_port: u16, // never used, I think? XXXX
     /// See [`GenericRouterStatus::doc_digest`].
     doc_digest: Option<D>,
     /// See [`GenericRouterStatus::flags`].
@@ -45,7 +43,6 @@ impl<D: Clone> RouterStatusBuilder<D> {
             nickname: None,
             identity: None,
             addrs: Vec::new(),
-            dir_port: 0,
             doc_digest: None,
             flags: RelayFlags::empty(),
             version: None,
@@ -78,13 +75,6 @@ impl<D: Clone> RouterStatusBuilder<D> {
         self.addrs.push(addr);
         self
     }
-    /// Set a directory port for this routerstatus.
-    ///
-    /// Nothing in Arti uses this value; it defaults to 0.
-    pub fn dir_port(&mut self, dir_port: u16) -> &mut Self {
-        self.dir_port = dir_port;
-        self
-    }
     /// Set the document digest for this routerstatus.
     ///
     /// This value is required.
@@ -152,7 +142,6 @@ impl<D: Clone> RouterStatusBuilder<D> {
             identity,
             addrs: self.addrs.clone(),
             or_port,
-            dir_port: self.dir_port,
             doc_digest,
             version: self.version.clone(),
             protos,