Commit b4177c1d authored by juga's avatar juga
Browse files

chg: Update arti dependencies to 1.2.2 

In concrete, adapt to tpo/core/arti!2057, in which Relay functionality
is moved into a RelayDetails type.

Closes #46
parent 57e363ea

Cargo.lock

+884 −610

File changed.

Preview size limit exceeded, changes collapsed.

Cargo.toml

+12 −14
Original line number Diff line number Diff line
@@ -49,17 +49,15 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] } 
# https://gitlab.torproject.org/tpo/core/arti/-/tags

# experimental implies experimental-api and enables experimental in the crates

# dependencies.

# For arti-client 0.9.2, experimental-api enables `ItemOrBool`, without

# enabling it for tor-config 0.9.2.

arti-client = {version = "0.9", features = ["experimental"]}

tor-chanmgr = {version = "0.9"}

tor-circmgr = {version = "0.9", features = ["experimental-api"] }

tor-config = {version = "0.9" }

tor-dirmgr = {version = "0.10" }

tor-geoip = {version = "0.1"}

tor-linkspec = {version = "0.8"}

tor-llcrypto = {version = "0.5"}

tor-netdir = {version = "0.9", features = ["experimental-api"]}

tor-netdoc = {version = "0.8" }

tor-proto = {version = "0.11" }

tor-rtcompat = {version = "0.9", features = ["tokio"]}
 
arti-client = {version = "0.18", features = ["experimental"]}

tor-chanmgr = {version = "0.18"}

tor-circmgr = {version = "0.18", features = ["experimental-api", "specific-relay"] }

tor-config = {version = "0.18" }

tor-dirmgr = {version = "0.18" }

tor-geoip = {version = "0.18"}

tor-linkspec = {version = "0.18"}

tor-llcrypto = {version = "0.18"}

tor-netdir = {version = "0.18", features = ["experimental-api"]}

tor-netdoc = {version = "0.18" }

tor-proto = {version = "0.18" }

tor-rtcompat = {version = "0.18", features = ["tokio"]}

src/cli/find.rs

+1 −1
Original line number Diff line number Diff line 
pub use crate::cli::queries::{QueryArg, QueryExpr, RelayAttr};

pub use crate::cli::queries::QueryExpr;

use crate::cli::util;

use crate::runnable::RunnableOffline;

use anyhow::Result;

src/cli/outcfg.rs

+1 −1
Original line number Diff line number Diff line
@@ -496,7 +496,7 @@ mod tests { 
            reason: None,

            project: "bad-relays-report".to_string(),

        };

        let expected_all_fps = vec![

        let expected_all_fps = [

            "0011BD2485AD45D984EC4159C88FC066E5E3300E".to_string(),

            "0123456789abcdef0123456789abcdef01234567"

                .to_string()

src/cli/queries.rs

+4 −1
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ use anyhow::Result; 
use clap::Args;

use ipnetwork::IpNetwork;

use std::fmt;

use std::ops::Deref;

use std::path::Path;

use std::str::FromStr;
@@ -85,7 +86,9 @@ impl QueryArg { 
                .expect("version error")

                .to_string()

                .contains(v),

            RelayAttr::PortPolicyAttr(pp) => &**relay.md().ipv4_policy() == pp,

            RelayAttr::PortPolicyAttr(pp) => {

                relay.low_level_details().ipv4_policy().deref() == pp

            }

            // ^ this is `&Arc<PortPolicy>`, 1st dereference `Arc`,

            // then `&`, then add `&` to match `&PortPolicy`

            // The following will try to find the relay in the list of parsed