chore: Unbitrot tracker

content-discovery/Cargo.toml

@@ -30,3 +30,5 @@ unused-async = "warn"
 iroh = { version ="0.34", features = ["discovery-pkarr-dht"] }
 iroh-base = "0.34"
 iroh-blobs = { version = "0.34", features = ["rpc"] }
+# explicitly specified until iroh minimal crates issues are solved, see https://github.com/n0-computer/iroh/pull/3255
+tokio = { version = "1.44.1" }

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

@@ -1,14 +1,14 @@
 //! Command line arguments.
-use clap::{Parser, Subcommand};
-use iroh::NodeId;
-use iroh_blobs::ticket::BlobTicket;
-use iroh_blobs::{Hash, HashAndFormat};
 use std::{
     fmt::Display,
     net::{SocketAddr, SocketAddrV4},
     str::FromStr,
 };
 
+use clap::{Parser, Subcommand};
+use iroh::NodeId;
+use iroh_blobs::{ticket::BlobTicket, Hash, HashAndFormat};
+
 #[derive(Parser, Debug)]
 pub struct Args {
     #[clap(subcommand)]

content-discovery/iroh-mainline-content-discovery/Cargo.toml

@@ -30,7 +30,7 @@ futures = { version = "0.3.25", optional = true }
 rcgen = { version = "0.13.1", optional = true }
 rustls = { version = "0.23", default-features = false, features = ["ring"], optional = true }
 genawaiter = { version = "0.99.1", features = ["futures03"], optional = true }
-tokio = { version = "1.36.0", optional = true }
+tokio = { workspace = true, optional = true }
 flume = "0.11.0"
 tls = { path = "../tls", optional = true }
 

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

@@ -1,4 +1,3 @@
-use genawaiter::sync::Gen;
 use std::{
     collections::{BTreeMap, BTreeSet, HashSet},
     net::{SocketAddr, SocketAddrV4, SocketAddrV6},
@@ -14,6 +13,7 @@ use futures::{
     stream::FusedStream,
     FutureExt, Stream, StreamExt,
 };
+use genawaiter::sync::Gen;
 use iroh::{
     discovery::{dns::DnsDiscovery, pkarr::PkarrPublisher, Discovery},
     Endpoint, NodeId,

content-discovery/iroh-mainline-tracker/Cargo.toml

@@ -21,7 +21,7 @@ humantime = "2.1.0"
 iroh = { workspace = true }
 iroh-blobs = { workspace = true }
 mainline = { version = "2.0.0", features = ["async"] }
-pkarr = { version = "1.0.1", features = ["async"] }
+pkarr = { version = "2.0.1", features = ["async"] }
 postcard = { version = "1", default-features = false, features = ["alloc", "use-std"] }
 iroh-quinn = "0.13"
 rand = "0.8"

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

@@ -125,9 +125,9 @@ impl Options {
     }
 }
 mod serde_duration {
+    use serde::{de::Deserializer, ser::Serializer};
+
     use super::*;
-    use serde::de::Deserializer;
-    use serde::ser::Serializer;
 
     pub fn serialize<S: Serializer>(duration: &Duration, serializer: S) -> Result<S::Ok, S::Error> {
         if serializer.is_human_readable() {

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

@@ -29,6 +29,10 @@ use tokio::sync::oneshot;
 mod tables;
 mod util;
 
+use self::{
+    tables::{ReadOnlyTables, ReadableTables, Tables},
+    util::PeekableFlumeReceiver,
+};
 use crate::{
     io::{log_connection_attempt, log_probe_attempt},
     iroh_blobs_util::{
@@ -38,11 +42,6 @@ use crate::{
     task_map::TaskMap,
 };
 
-use self::{
-    tables::{ReadOnlyTables, ReadableTables, Tables},
-    util::PeekableFlumeReceiver,
-};
-
 /// The tracker server.
 ///
 /// This is a cheaply cloneable handle to the state and the options.