clippy

Author: rklaehn

content-discovery/README.md

@@ -1,6 +1,12 @@
 # Iroh content discovery
 
-This library provides global content discovery for iroh.
+This rust workspace provides global content discovery for iroh.
+
+*iroh-mainline-content-discovery* is a library that provides a discovery protocol,
+a client implementation, and a client command line utility.
+
+*iroh-mainline-tracker* is a server implementation for the content discovery
+protocol.
 
 ## Building from source
 
@@ -9,12 +15,12 @@ Make sure you have an up to date version of [rust](https://www.rust-lang.org/) i
 `cargo` for your platform.
 
 Then run `cargo build --release` from the root directory. The resulting binary
-will be in `target/release/tracker`
+will be in `target/release/iroh-mainline-tracker`
 
 ## Running the tracker
 
 ```sh
-tracker server
+iroh-mainline-tracker
 ```
 
 Will run the server with a persistent node id and announce information.
@@ -24,7 +30,7 @@ Will run the server with a persistent node id and announce information.
 When announcing content, you can give either iroh tickets or content hashes.
 
 ```sh
-tracker announce \
+iroh-mainline-content-discovery announce \
     --tracker t3od3nblvk6csozc3oe7rjum7oebnnwwfkebolbxf2o66clzdyha \
     blob:ealcoyhcjxyklzee4manl3b5see3k3nwekf6npw5oollcsflrsduiaicaiafetezhwjouayaycuadbes5ibqaq7qasiyqmqo74ijal7k7ec4pni5htntx4tpoawgvmbhaa3txa4uaa
 ```
@@ -36,7 +42,7 @@ When querying content, you can use tickets, hashes, or hash and format.
 When using tickets, the address part of the ticket will be ignored.
 
 ```sh
-tracker query \
+iroh-mainline-content-discovery query \
     --tracker t3od3nblvk6csozc3oe7rjum7oebnnwwfkebolbxf2o66clzdyha \
     blob:ealcoyhcjxyklzee4manl3b5see3k3nwekf6npw5oollcsflrsduiaicaiafetezhwjouayaycuadbes5ibqaq7qasiyqmqo74ijal7k7ec4pni5htntx4tpoawgvmbhaa3txa4uaa
 ```

content-discovery/iroh-mainline-content-discovery/src/client.rs

@@ -257,7 +257,7 @@ impl std::str::FromStr for TrackerId {
 pub async fn connect(tracker: &TrackerId, local_port: u16) -> anyhow::Result<quinn::Connection> {
     match tracker {
         TrackerId::Addr(tracker) => connect_socket(*tracker, local_port).await,
-        TrackerId::NodeId(tracker) => connect_magic(&tracker, local_port).await,
+        TrackerId::NodeId(tracker) => connect_magic(tracker, local_port).await,
     }
 }
 

content-discovery/iroh-mainline-tracker/src/args.rs

@@ -1,19 +1,8 @@
 //! Command line arguments.
-use clap::{Parser, Subcommand};
+use clap::Parser;
 
 #[derive(Parser, Debug)]
 pub struct Args {
-    #[clap(subcommand)]
-    pub command: Commands,
-}
-
-#[derive(Subcommand, Debug)]
-pub enum Commands {
-    Server(ServerArgs),
-}
-
-#[derive(Parser, Debug)]
-pub struct ServerArgs {
     /// The port to listen on.
     #[clap(long, default_value_t = 0xacacu16)]
     pub magic_port: u16,

content-discovery/iroh-mainline-tracker/src/main.rs

@@ -28,7 +28,7 @@ use iroh_pkarr_node_discovery::PkarrNodeDiscovery;
 use tokio::io::AsyncWriteExt;
 use tokio_util::task::LocalPoolHandle;
 
-use crate::args::{Args, Commands, ServerArgs};
+use crate::args::Args;
 
 static VERBOSE: AtomicBool = AtomicBool::new(false);
 
@@ -100,7 +100,7 @@ fn write_defaults() -> anyhow::Result<()> {
     Ok(())
 }
 
-async fn server(args: ServerArgs) -> anyhow::Result<()> {
+async fn server(args: Args) -> anyhow::Result<()> {
     set_verbose(!args.quiet);
     let tpc = LocalPoolHandle::new(2);
     let home = tracker_home()?;
@@ -143,9 +143,7 @@ async fn server(args: ServerArgs) -> anyhow::Result<()> {
 async fn main() -> anyhow::Result<()> {
     setup_logging();
     let args = Args::parse();
-    match args.command {
-        Commands::Server(args) => server(args).await,
-    }
+    server(args).await
 }
 
 /// Returns default server configuration along with its certificate.

content-discovery/iroh-mainline-tracker/src/tracker.rs

@@ -165,10 +165,10 @@ impl Tracker {
     pub async fn dht_announce_loop(self, port: u16) -> anyhow::Result<()> {
         let dht = mainline::Dht::default();
         loop {
-            let state = self.0.state.read().unwrap();
-            let content: BTreeSet<HashAndFormat> =
-                state.announce_data.iter().map(|(haf, _)| *haf).collect();
-            drop(state);
+            let content: BTreeSet<HashAndFormat> = {
+                let state = self.0.state.read().unwrap();
+                state.announce_data.keys().copied().collect()
+            };
             let mut announce = announce_dht(
                 dht.clone(),
                 content,
@@ -489,7 +489,7 @@ impl Tracker {
     )> {
         let t0 = Instant::now();
         let res = endpoint
-            .connect_by_node_id(&host, &iroh_bytes::protocol::ALPN)
+            .connect_by_node_id(&host, iroh_bytes::protocol::ALPN)
             .await;
         log_connection_attempt(&self.0.options.dial_log, &host, t0, &res)?;
         let connection = match res {