Skip to content

Commit 9f78f23

Browse files
authored
chore: update to latest iroh, iroh-gossip, and iroh-blobs (#41)
* chore(h3-iroh): upgrade to latest iroh * chore(iroh-dag-sync): upgrade to latest iroh * chore(content-discovery): upgrade to latest iroh * chore(iroh-pkarr-naming-system): upgrade to latest iroh
1 parent 903ae22 commit 9f78f23

File tree

9 files changed

+108
-209
lines changed

9 files changed

+108
-209
lines changed

content-discovery/Cargo.lock

Lines changed: 87 additions & 188 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

content-discovery/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ missing_debug_implementations = "warn"
2626
unused-async = "warn"
2727

2828
[workspace.dependencies]
29-
iroh = { version ="0.90", features = ["discovery-pkarr-dht"] }
30-
iroh-base = "0.90"
31-
iroh-blobs = { version = "0.91" }
29+
iroh = { version ="0.91", features = ["discovery-pkarr-dht"] }
30+
iroh-base = "0.91"
31+
iroh-blobs = { version = "0.93" }
3232
# explicitly specified until iroh minimal crates issues are solved, see https://github.com/n0-computer/iroh/pull/3255
3333
tokio = { version = "1.44.1" }
3434
tokio-stream = { version = "0.1.17" }

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ macro_rules! log {
4747
async fn await_relay_region(endpoint: &Endpoint) -> anyhow::Result<()> {
4848
let t0 = Instant::now();
4949
loop {
50-
let addr = endpoint.node_addr().initialized().await?;
50+
let addr = endpoint.node_addr().initialized().await;
5151
if addr.relay_url().is_some() {
5252
break;
5353
}
@@ -113,7 +113,7 @@ async fn server(args: Args) -> anyhow::Result<()> {
113113
let db = Tracker::new(options, endpoint.clone())?;
114114
db.dump().await?;
115115
await_relay_region(&endpoint).await?;
116-
let addr = endpoint.node_addr().initialized().await?;
116+
let addr = endpoint.node_addr().initialized().await;
117117
println!("tracker addr: {}\n", addr.node_id);
118118
info!("listening on {:?}", addr);
119119
// let db2 = db.clone();

h3-iroh/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ http-body = { version = "1", optional = true }
1515
http-body-util = { version = "0.1", optional = true }
1616
hyper = { version = "1.5", optional = true }
1717
hyper-util = { version = "0.1", optional = true }
18-
iroh = "0.90"
19-
iroh-base = { version = "0.90", features = ["ticket"] }
18+
iroh = "0.91"
19+
iroh-base = { version = "0.91", features = ["ticket"] }
2020
tokio = { version = "1", features = ["io-util"], default-features = false}
2121
tokio-util = "0.7"
2222
tower = { version = "0.5", optional = true }

h3-iroh/examples/server-axum.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ async fn main() -> Result<()> {
2121
info!("accepting connections on node: {}", ep.node_id());
2222

2323
// Wait for direct addresses and a RelayUrl before printing a NodeTicket.
24-
ep.direct_addresses().initialized().await?;
25-
ep.home_relay().initialized().await?;
26-
let ticket = NodeTicket::new(ep.node_addr().initialized().await?);
24+
ep.direct_addresses().initialized().await;
25+
ep.home_relay().initialized().await;
26+
let ticket = NodeTicket::new(ep.node_addr().initialized().await);
2727
info!("node ticket: {ticket}");
2828
info!("run: cargo run --example client -- iroh+h3://{ticket}/");
2929

h3-iroh/examples/server.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ async fn main() -> Result<()> {
5050
info!("accepting connections on node: {}", ep.node_id());
5151

5252
// Wait for direct addresses and a RelayUrl before printing a NodeTicket.
53-
ep.direct_addresses().initialized().await?;
54-
ep.home_relay().initialized().await?;
55-
let ticket = NodeTicket::new(ep.node_addr().initialized().await?);
53+
ep.direct_addresses().initialized().await;
54+
ep.home_relay().initialized().await;
55+
let ticket = NodeTicket::new(ep.node_addr().initialized().await);
5656
info!("node ticket: {ticket}");
5757
info!("run e.g.: cargo run --example client -- iroh+h3://{ticket}/Cargo.toml");
5858

iroh-dag-sync/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ version = "0.1.0"
44
edition = "2021"
55

66
[dependencies]
7-
iroh-blobs = "0.90"
8-
iroh-gossip = "0.90"
9-
iroh = "0.90"
10-
iroh-base = { version ="0.90", features = ["ticket"] }
7+
iroh-blobs = "0.93"
8+
iroh-gossip = "0.91"
9+
iroh = "0.91"
10+
iroh-base = { version ="0.91", features = ["ticket"] }
1111
iroh-car = "0.5.0"
1212
redb = "2.1.1"
1313
clap = { version = "4.5.7", features = ["derive"] }

iroh-dag-sync/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ async fn main() -> anyhow::Result<()> {
123123
args::SubCommand::Node(args) => {
124124
let endpoint =
125125
create_endpoint(args.net.iroh_ipv4_addr, args.net.iroh_ipv6_addr).await?;
126-
endpoint.home_relay().initialized().await?;
127-
let addr = endpoint.node_addr().initialized().await?;
126+
endpoint.home_relay().initialized().await;
127+
let addr = endpoint.node_addr().initialized().await;
128128
println!("Node id:\n{}", addr.node_id);
129129
println!(
130130
"Listening on {:#?}, {:#?}",

iroh-pkarr-naming-system/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ edition = "2021"
88
[dependencies]
99
anyhow = "1.0.79"
1010
derive_more = "0.99.17"
11-
iroh = "0.90"
12-
iroh-blobs = "0.90"
11+
iroh = "0.91"
12+
iroh-blobs = "0.93"
1313
pkarr = { version = "2.3.1", features = ["async", "dht"] }
1414
tokio = "1.35.1"
1515
tokio-util = "0.7.12"

0 commit comments

Comments
 (0)