Commit fbf2a27d authored by Ian Jackson's avatar Ian Jackson 💬
Browse files

Merge branch 'rs-stats' into 'main' 

tor-netdoc: routerstatus entries: Add `stats` item (votes only)

See merge request !4097
parents 9de6422b 9ef51f2d

crates/tor-netdoc/semver.md

+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@ ADDED: `F64Finite` type 
ADDED: `doc::netstatus::{plain, md, vote}::NetworkStatus`

BREAKING: `AuthCertUnverified::verify` doesn't take times; instead returns `TimerangeBound`

DEPRECATED: `parse2::check_validity_time` and `check_validity_time_tolerance`

ADDED: `RouterStatus` fields `r.dir_port`, `p`, `id`

ADDED: `impl From<std::convert::Infallible> for Error`

ADDED: `RouterStatus` fields `r.dir_port`, `p`, `id`, `stats`

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

+3 −2
Original line number Diff line number Diff line
@@ -11,8 +11,9 @@ pub(crate) mod plain; 
pub(crate) mod vote;



use super::{ConsensusFlavor, ConsensusMethods, consensus_methods_comma_separated};

use crate::doc::netstatus::NetstatusKwd;

use crate::doc::netstatus::{IgnoredPublicationTimeSp, Protocols, RelayWeight, RelayWeightsItem};

use crate::doc::netstatus::{

    IgnoredPublicationTimeSp, NetParams, NetstatusKwd, Protocols, RelayWeight, RelayWeightsItem,

};

use crate::encode::{EncodeOrd, ItemEncoder};

use crate::parse::parser::Section;

use crate::parse2::ItemArgumentParseable;

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

+1 −0
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ impl RouterStatusBuilder { 
            weight,

            port_policy: ns_expr!(None, NotPresent, Void {}),

            ed25519_id: NotPresent,

            stats: NotPresent,

        })

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -199,6 +199,7 @@ impl RouterStatus { 
            weight,

            port_policy: ns_expr!(None, NotPresent, Void {}),

            ed25519_id: NotPresent,

            stats: NotPresent,

        })

    }

}

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

+5 −0
Original line number Diff line number Diff line
@@ -174,6 +174,11 @@ pub struct RouterStatus { 
    // otherwise, we are missing handling of `id none`.

    #[deftly(netdoc(keyword = "id"))] 

    pub ed25519_id: ns_type!(NotPresent, NotPresent, Ed25519IdentityLine),



    /// `stats` -- Statistics for this relay

    ///

    /// <https://spec.torproject.org/dir-spec/consensus-formats.html#item:stats>

    pub stats: ns_type!(NotPresent, NotPresent, NetParams<F64Finite>),

}



impl RouterStatus {