Commit 140e5d4c authored by Nick Mathewson's avatar Nick Mathewson 🥔
Browse files

Merge remote-tracking branch 'origin/mr/82'

parents 95343a25 b0bb7bd1

crates/arti/src/main.rs

+3 −3
Original line number Diff line number Diff line
@@ -208,9 +208,9 @@ impl ArtiConfig { 
    fn get_circ_config(&self) -> Result<CircMgrConfig> {

        let mut builder = tor_circmgr::CircMgrConfigBuilder::default();

        Ok(builder

            .set_path_config(self.path_rules.clone())

            .set_request_timing(self.request_timing.clone())

            .set_circuit_timing(self.circuit_timing.clone())

            .path_config(self.path_rules.clone())

            .request_timing(self.request_timing.clone())

            .circuit_timing(self.circuit_timing.clone())

            .build()?)

    }

}

crates/tor-circmgr/src/config.rs

+4 −4
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ use std::time::Duration; 
/// This type is immutable once constructed. To create an object of this type,

/// use [`RequestTimingBuilder`].

#[derive(Debug, Clone, Builder, Deserialize)]

#[builder(setter(prefix = "set"))]

#[builder]

pub struct RequestTiming {

    /// When a circuit is requested, we stop retrying new circuits

    /// after this much time.
@@ -48,7 +48,7 @@ impl Default for RequestTiming { 
/// This type is immutable once constructed.  To build one, use

/// [`PathConfigBuilder`].

#[derive(Debug, Clone, Builder, Deserialize, Default)]

#[builder(setter(prefix = "set"))]

#[builder]

pub struct PathConfig {

    /// Override the default required distance for two relays to share

    /// the same circuit.
@@ -61,7 +61,7 @@ pub struct PathConfig { 
/// This type is immutable once constructd. To create an object of this

/// type, use [`CircuitTimingBuilder`].

#[derive(Debug, Clone, Builder, Deserialize)]

#[builder(setter(prefix = "set"))]

#[builder]

pub struct CircuitTiming {

    /// How long after a circuit has first been used should we give

    /// it out for new requests?
@@ -85,7 +85,7 @@ impl Default for CircuitTiming { 
/// This type is immutable once constructed.  To create an object of

/// this type, use [`CircMgrConfigBuilder`].

#[derive(Debug, Clone, Builder)]

#[builder(setter(prefix = "set"))]

#[builder]

pub struct CircMgrConfig {

    /// Override the default required distance for two relays to share

    /// the same circuit.

crates/tor-circmgr/src/mgr.rs

+1 −1
Original line number Diff line number Diff line
@@ -1682,7 +1682,7 @@ mod test { 
            let builder = FakeBuilder::new(&rt);



            let circuit_timing = CircuitTimingBuilder::default()

                .set_max_dirtiness(Duration::from_secs(15))

                .max_dirtiness(Duration::from_secs(15))

                .build()

                .unwrap();

crates/tor-dirmgr/src/config.rs

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ use serde::Deserialize; 
/// part of Arti's configuration.

#[derive(Deserialize, Debug, Clone, Builder)]

#[serde(deny_unknown_fields)]

#[builder(setter(prefix = "set"), build_fn(validate = "Self::validate"))]

#[builder(build_fn(validate = "Self::validate"))]

pub struct NetworkConfig {

    /// List of locations to look in when downloading directory information,

    /// if we don't actually have a directory yet.
@@ -313,7 +313,7 @@ mod test { 


        // with any authorities set, the fallback list _must_ be set

        // or the build fails.

        bld.set_authorities(vec![

        bld.authorities(vec![

            Authority::builder()

                .name("Hello")

                .v3ident([b'?'; 20].into())
@@ -325,7 +325,7 @@ mod test { 
        ]);

        assert!(bld.build().is_err());



        bld.set_fallback_caches(vec![FallbackDir::builder()

        bld.fallback_caches(vec![FallbackDir::builder()

            .rsa_identity([b'x'; 20].into())

            .ed_identity([b'y'; 32].into())

            .orport("127.0.0.1:99".parse().unwrap())