upgrade to [email protected], remove iroh_test dep

Author: “ramfox”

Cargo.lock

@@ -40,10 +40,10 @@ genawaiter = { version = "0.99.1", features = ["futures03"] }
 hashlink = { version = "0.9.0", optional = true }
 hex = "0.4.3"
 indicatif = { version = "0.17.8", optional = true }
-iroh-base = { version = "0.31" }
+iroh-base = { version = "0.32" }
 iroh-io = { version = "0.6.0", features = ["stats"] }
 iroh-metrics = { version = "0.31", default-features = false }
-iroh = "0.31"
+iroh = "0.32"
 nested_enum_utils = { version = "0.1.0", optional = true }
 num_cpus = "1.15.0"
 oneshot = "0.1.8"
@@ -77,11 +77,11 @@ walkdir = { version = "2.5.0", optional = true }
 
 # Examples
 console = { version = "0.15.8", optional = true }
+tracing-test = "0.2.5"
 
 [dev-dependencies]
 http-body = "1.0"
-iroh-test = { version = "0.31" }
-iroh = { version = "0.31", features = ["test-utils"] }
+iroh = { version = "0.32", features = ["test-utils"] }
 futures-buffered = "0.2.4"
 proptest = "1.0.0"
 serde_json = "1.0.107"
@@ -184,8 +184,3 @@ debug-assertions = false
 opt-level = 3
 panic = 'abort'
 incremental = false
-
-[patch.crates-io]
-iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
-iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
-quic-rpc = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "release-prep" }

Cargo.toml

@@ -33,6 +33,7 @@ Here is a basic example of how to set up `iroh-blobs` with `iroh`:
 ```rust
 use iroh::{protocol::Router, Endpoint};
 use iroh_blobs::net_protocol::Blobs;
+use iroh_blobs::store::traits::Store;
 
 #[tokio::main]
 async fn main() -> anyhow::Result<()> {

README.md

@@ -7,6 +7,7 @@ use std::{
 use anyhow::anyhow;
 use futures_util::future::FutureExt;
 use iroh::SecretKey;
+use tracing_test::traced_test;
 
 use super::*;
 use crate::{
@@ -48,8 +49,6 @@ impl Downloader {
         let lp = LocalPool::default();
         lp.spawn_detached(move || async move {
             // we want to see the logs of the service
-            let _guard = iroh_test::logging::setup();
-
             let service = Service::new(getter, dialer, concurrency_limits, retry_config, msg_rx);
             service.run().await
         });
@@ -66,8 +65,8 @@ impl Downloader {
 
 /// Tests that receiving a download request and performing it doesn't explode.
 #[tokio::test]
+#[traced_test]
 async fn smoke_test() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     let concurrency_limits = ConcurrencyLimits::default();
@@ -90,8 +89,8 @@ async fn smoke_test() {
 
 /// Tests that multiple intents produce a single request.
 #[tokio::test]
+#[traced_test]
 async fn deduplication() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     // make request take some time to ensure the intents are received before completion
@@ -123,8 +122,8 @@ async fn deduplication() {
 /// Tests that the request is cancelled only when all intents are cancelled.
 #[ignore = "flaky"]
 #[tokio::test]
+#[traced_test]
 async fn cancellation() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     // make request take some time to ensure cancellations are received on time
@@ -159,8 +158,8 @@ async fn cancellation() {
 /// maximum number of concurrent requests is not exceed.
 /// NOTE: This is internally tested by [`Service::check_invariants`].
 #[tokio::test]
+#[traced_test]
 async fn max_concurrent_requests_total() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     // make request take some time to ensure concurreny limits are hit
@@ -202,8 +201,8 @@ async fn max_concurrent_requests_total() {
 /// the maximum number of requests per peer is still respected.
 /// NOTE: This is internally tested by [`Service::check_invariants`].
 #[tokio::test]
+#[traced_test]
 async fn max_concurrent_requests_per_peer() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     // make request take some time to ensure concurreny limits are hit
@@ -239,8 +238,8 @@ async fn max_concurrent_requests_per_peer() {
 /// state. The download then finishes, and we make sure that all events are emitted properly, and
 /// the progress state of the handles converges.
 #[tokio::test]
+#[traced_test]
 async fn concurrent_progress() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
 
@@ -356,8 +355,8 @@ async fn concurrent_progress() {
 }
 
 #[tokio::test]
+#[traced_test]
 async fn long_queue() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     let concurrency_limits = ConcurrencyLimits {
@@ -394,8 +393,8 @@ async fn long_queue() {
 /// If a download errors with [`FailureAction::DropPeer`], make sure that the peer is not dropped
 /// while other transfers are still running.
 #[tokio::test]
+#[traced_test]
 async fn fail_while_running() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     let (downloader, _lp) =
@@ -432,8 +431,8 @@ async fn fail_while_running() {
 }
 
 #[tokio::test]
+#[traced_test]
 async fn retry_nodes_simple() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     let (downloader, _lp) =
@@ -453,8 +452,8 @@ async fn retry_nodes_simple() {
 }
 
 #[tokio::test]
+#[traced_test]
 async fn retry_nodes_fail() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     let config = RetryConfig {
@@ -491,8 +490,8 @@ async fn retry_nodes_fail() {
 }
 
 #[tokio::test]
+#[traced_test]
 async fn retry_nodes_jump_queue() {
-    let _guard = iroh_test::logging::setup();
     let dialer = dialer::TestingDialer::default();
     let getter = getter::TestingGetter::default();
     let concurrency_limits = ConcurrencyLimits {

src/downloader/test.rs

@@ -417,7 +417,7 @@ impl<'de> Deserialize<'de> for HashAndFormat {
 #[cfg(test)]
 mod tests {
 
-    use iroh_test::{assert_eq_hex, hexdump::parse_hexdump};
+    use crate::{assert_eq_hex, util::hexdump::parse_hexdump};
     use serde_test::{assert_tokens, Configure, Token};
 
     use super::*;

src/hash.rs

@@ -483,7 +483,7 @@ impl TryFrom<VarInt> for Closed {
 
 #[cfg(test)]
 mod tests {
-    use iroh_test::{assert_eq_hex, hexdump::parse_hexdump};
+    use crate::{assert_eq_hex, util::hexdump::parse_hexdump};
 
     use super::{GetRequest, Request};
 

src/protocol.rs

@@ -354,7 +354,7 @@ impl<'a> Iterator for NonEmptyRequestRangeSpecIter<'a> {
 mod tests {
     use std::ops::Range;
 
-    use iroh_test::{assert_eq_hex, hexdump::parse_hexdump};
+    use crate::{assert_eq_hex, util::hexdump::parse_hexdump};
     use proptest::prelude::*;
 
     use super::*;