cleanup & ci

n0-computer · May 22, 2024 · 1ff6930 · 1ff6930
1 parent 1e1fd6d
commit 1ff6930
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 9 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -115,7 +115,7 @@ jobs:
         # uses: obi1kenobi/cargo-semver-checks-action@v2
         uses: n0-computer/cargo-semver-checks-action@feat-baseline
         with:
-          package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-docs
+          package: iroh, iroh-base, iroh-blobs, iroh-cli, iroh-dns-server, iroh-gossip, iroh-metrics, iroh-net, iroh-net-bench, iroh-docs
           baseline-rev: ${{ env.HEAD_COMMIT_SHA }}
           use-cache: false
 

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -23,7 +23,7 @@ env:
   RUSTFLAGS: -Dwarnings
   RUSTDOCFLAGS: -Dwarnings
   SCCACHE_CACHE_SIZE: "50G"
-  CRATES_LIST: "iroh,iroh-blobs,iroh-gossip,iroh-metrics,iroh-net,iroh-docs,iroh-test,iroh-cli,iroh-dns-server"
+  CRATES_LIST: "iroh,iroh-blobs,iroh-gossip,iroh-metrics,iroh-net,iroh-net-bench,iroh-docs,iroh-test,iroh-cli,iroh-dns-server"
 
 jobs:
   build_and_test_nix:

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/iroh-net/bench/Cargo.toml b/iroh-net/bench/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "iroh-net-bench"
-version = "0.13.0"
+version = "0.16.0"
 edition = "2021"
 license = "MIT OR Apache-2.0"
 publish = false

diff --git a/iroh-net/bench/src/lib.rs b/iroh-net/bench/src/lib.rs
@@ -208,6 +208,9 @@ pub async fn client_handler(
     // Wait for remaining streams to finish
     let _ = sem.acquire_many(opt.max_streams as u32).await.unwrap();
 
+    stats.upload_stats.total_duration = start.elapsed();
+    stats.download_stats.total_duration = start.elapsed();
+
     for result in results.lock().unwrap().drain(..) {
         match result {
             Ok((upload_result, download_result)) => {
@@ -222,9 +225,6 @@ pub async fn client_handler(
         }
     }
 
-    stats.upload_stats.total_duration = start.elapsed();
-    stats.download_stats.total_duration = start.elapsed();
-
     // Explicit close of the connection, since handles can still be around due
     // to `Arc`ing them
     connection.close(0u32, b"Benchmark done");

diff --git a/iroh-net/bench/src/quinn.rs b/iroh-net/bench/src/quinn.rs
@@ -86,8 +86,7 @@ pub async fn connect_client(
     let connection = ep
         .connect_with(config, server_addr, "local")?
         .await
-        .context("connecting")
-        .unwrap();
+        .context("connecting")?;
     Ok((ep, connection))
 }