Skip to content

Commit

Permalink
cleanup & ci
Browse files Browse the repository at this point in the history
  • Loading branch information
Arqu committed May 22, 2024
1 parent 8cc888b commit 555d528
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion iroh-net/bench/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 3 additions & 3 deletions iroh-net/bench/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)) => {
Expand All @@ -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");
Expand Down
3 changes: 1 addition & 2 deletions iroh-net/bench/src/quinn.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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))
}

Expand Down

0 comments on commit 555d528

Please sign in to comment.