adjust code to new iroh apis

Author: “ramfox”

Cargo.lock

@@ -187,5 +187,5 @@ incremental = false
 
 [patch.crates-io]
 iroh = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }
-quic-rpc = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "main" }
+quic-rpc = { git = "https://github.com/n0-computer/quic-rpc.git", branch = "patch-iroh-main" }
 iroh-base = { git = "https://github.com/n0-computer/iroh.git", branch = "main" }

Cargo.toml

@@ -1,44 +1,46 @@
+[advisories]
+ignore = [
+    "RUSTSEC-2024-0370",
+    "RUSTSEC-2024-0384",
+    "RUSTSEC-2024-0436",
+    "RUSTSEC-2023-0089",
+]
+
 [bans]
-multiple-versions = "allow"
 deny = [
-     "aws-lc",
-     "aws-lc-rs",
-     "aws-lc-sys",
-     "native-tls",
-     "openssl",
+    "aws-lc",
+    "aws-lc-rs",
+    "aws-lc-sys",
+    "native-tls",
+    "openssl",
 ]
+multiple-versions = "allow"
 
 [licenses]
 allow = [
-      "Apache-2.0",
-      "Apache-2.0 WITH LLVM-exception",
-      "BSD-2-Clause",
-      "BSD-3-Clause",
-      "BSL-1.0", # BOSL license
-      "ISC",
-      "MIT",
-      "Zlib",
-      "MPL-2.0", # https://fossa.com/blog/open-source-software-licenses-101-mozilla-public-license-2-0/
-      "Unicode-3.0",
-      "Unlicense", # https://unlicense.org/
+    "Apache-2.0",
+    "Apache-2.0 WITH LLVM-exception",
+    "BSD-2-Clause",
+    "BSD-3-Clause",
+    "BSL-1.0",
+    "ISC",
+    "MIT",
+    "Zlib",
+    "MPL-2.0",
+    "Unicode-3.0",
+    "Unlicense",
 ]
 
 [[licenses.clarify]]
-name = "ring"
 expression = "MIT AND ISC AND OpenSSL"
-license-files = [
-      { path = "LICENSE", hash = 0xbd0eed23 },
-]
+name = "ring"
 
-[advisories]
-ignore = [
-  "RUSTSEC-2024-0370", # unmaintained, no upgrade available
-  "RUSTSEC-2024-0384", # unmaintained, no upgrade available
-  "RUSTSEC-2024-0436", # unmaintained paste
-  "RUSTSEC-2023-0089", # unmaintained, no upgrade available yet
-]
+[[licenses.clarify.license-files]]
+hash = 3171872035
+path = "LICENSE"
 
 [sources]
 allow-git = [
     "https://github.com/n0-computer/iroh.git",
+    "https://github.com/n0-computer/quic-rpc.git",
 ]

deny.toml

@@ -97,7 +97,7 @@ async fn main() -> Result<()> {
 
     // Add our protocol, identified by our ALPN, to the node, and spawn the node.
     let builder = builder.accept(ALPN, proto.clone());
-    let node = builder.spawn().await?;
+    let node = builder.spawn();
 
     match args.command {
         Command::Listen { text } => {

examples/custom-protocol.rs

@@ -73,7 +73,7 @@ async fn main() -> anyhow::Result<()> {
     let builder = Router::builder(endpoint);
     let blobs = Blobs::memory().build(builder.endpoint());
     let builder = builder.accept(iroh_blobs::ALPN, blobs.clone());
-    let node = builder.spawn().await?;
+    let node = builder.spawn();
     let blobs_client = blobs.client();
 
     match &cli.command {

examples/discovery-local-network.rs

@@ -39,7 +39,7 @@ async fn main() -> Result<()> {
     let builder = Router::builder(endpoint);
     let blobs = Blobs::memory().build(builder.endpoint());
     let builder = builder.accept(iroh_blobs::ALPN, blobs.clone());
-    let node = builder.spawn().await?;
+    let node = builder.spawn();
     let blobs_client = blobs.client();
 
     println!("fetching hash:  {}", ticket.hash());

examples/hello-world-fetch.rs

@@ -27,7 +27,7 @@ async fn main() -> anyhow::Result<()> {
     let blobs = Blobs::memory().build(builder.endpoint());
     let builder = builder.accept(iroh_blobs::ALPN, blobs.clone());
     let blobs_client = blobs.client();
-    let node = builder.spawn().await?;
+    let node = builder.spawn();
 
     // add some data and remember the hash
     let res = blobs_client.add_bytes("Hello, world!").await?;

examples/hello-world-provide.rs

@@ -22,8 +22,7 @@ async fn main() -> Result<()> {
     // to the blobs protocol.
     let router = Router::builder(endpoint)
         .accept(iroh_blobs::ALPN, blobs.clone())
-        .spawn()
-        .await?;
+        .spawn();
 
     // We use a blobs client to interact with the blobs protocol we're running locally:
     let blobs_client = blobs.client();

examples/transfer.rs

@@ -1083,7 +1083,7 @@ mod tests {
                 router = router.accept(crate::ALPN, blobs.clone());
 
                 // Build the router
-                let router = router.spawn().await?;
+                let router = router.spawn();
 
                 // Setup RPC
                 let (internal_rpc, controller) = quic_rpc::transport::flume::channel(32);

src/rpc/client/blobs.rs

@@ -101,9 +101,7 @@ async fn node<S: Store>(store: S, gc_period: Duration) -> (Node<S>, async_channe
     let blobs = Blobs::builder(store.clone()).build(&endpoint);
     let router = Router::builder(endpoint)
         .accept(iroh_blobs::ALPN, blobs.clone())
-        .spawn()
-        .await
-        .unwrap();
+        .spawn();
     blobs
         .start_gc(GcConfig {
             period: gc_period,

tests/gc.rs

@@ -25,8 +25,7 @@ impl Node {
         let blobs = Blobs::builder(store).build(&endpoint);
         let router = iroh::protocol::Router::builder(endpoint)
             .accept(iroh_blobs::ALPN, blobs.clone())
-            .spawn()
-            .await?;
+            .spawn();
         let (config, key) = quic_rpc::transport::quinn::configure_server()?;
         let endpoint = quinn::Endpoint::server(config, "127.0.0.1:0".parse().unwrap())?;
         let local_addr = endpoint.local_addr()?;