move quinn dependence to dev

Author: “ramfox”

Cargo.lock

@@ -56,7 +56,6 @@ postcard = { version = "1", default-features = false, features = [
 ] }
 quic-rpc = { version = "0.18", optional = true }
 quic-rpc-derive = { version = "0.17", optional = true }
-quinn = { package = "iroh-quinn", version = "0.13", features = ["ring"] }
 rand = "0.8"
 range-collections = "0.4.0"
 redb = { version = "2.2.0", optional = true }
@@ -82,6 +81,7 @@ tracing-test = "0.2.5"
 [dev-dependencies]
 http-body = "1.0"
 iroh = { version = "0.32", features = ["test-utils"] }
+quinn = { package = "iroh-quinn", version = "0.13", features = ["ring"] }
 futures-buffered = "0.2.4"
 proptest = "1.0.0"
 serde_json = "1.0.107"

Cargo.toml

@@ -225,7 +225,7 @@ impl BlobSearch {
             match recv.read_exact(&mut hash_bytes).await {
                 // FinishedEarly means that the remote side did not send further data,
                 // so in this case we break our loop.
-                Err(quinn::ReadExactError::FinishedEarly(_)) => break,
+                Err(iroh::endpoint::ReadExactError::FinishedEarly(_)) => break,
                 // Other errors are connection errors, so we bail.
                 Err(err) => return Err(err.into()),
                 Ok(_) => {}

examples/connect/mod.rs

@@ -15,7 +15,7 @@ use iroh_blobs::{
 use iroh_io::ConcatenateSliceWriter;
 use tracing_subscriber::{prelude::*, EnvFilter};
 
-mod connect;
+const EXAMPLE_ALPN: &[u8] = b"n0/iroh/examples/bytes/0";
 
 // set the RUST_LOG env var to one of {debug,info,warn} to see logging info
 pub fn setup_logging() {
@@ -42,7 +42,7 @@ async fn main() -> Result<()> {
     // create an endpoint to listen for incoming connections
     let endpoint = iroh::Endpoint::builder()
         .relay_mode(iroh::RelayMode::Disabled)
-        .alpns(vec![connect::EXAMPLE_ALPN.into()])
+        .alpns(vec![EXAMPLE_ALPN.into()])
         .bind()
         .await?;
     println!(
@@ -52,7 +52,7 @@ async fn main() -> Result<()> {
     println!("fetching hash {hash} from {:?}", node.node_id);
 
     // connect
-    let connection = endpoint.connect(node, connect::EXAMPLE_ALPN).await?;
+    let connection = endpoint.connect(node, EXAMPLE_ALPN).await?;
 
     match format {
         BlobFormat::HashSeq => {

examples/custom-protocol.rs

@@ -19,7 +19,7 @@ use iroh_blobs::{
 use tokio::io::AsyncWriteExt;
 use tracing_subscriber::{prelude::*, EnvFilter};
 
-mod connect;
+const EXAMPLE_ALPN: &[u8] = b"n0/iroh/examples/bytes/0";
 
 // set the RUST_LOG env var to one of {debug,info,warn} to see logging info
 pub fn setup_logging() {
@@ -46,7 +46,7 @@ async fn main() -> Result<()> {
     // create an endpoint to listen for incoming connections
     let endpoint = iroh::Endpoint::builder()
         .relay_mode(iroh::RelayMode::Disabled)
-        .alpns(vec![connect::EXAMPLE_ALPN.into()])
+        .alpns(vec![EXAMPLE_ALPN.into()])
         .bind()
         .await?;
     println!(
@@ -56,7 +56,7 @@ async fn main() -> Result<()> {
     println!("fetching hash {hash} from {:?}", node.node_id);
 
     // connect
-    let connection = endpoint.connect(node, connect::EXAMPLE_ALPN).await?;
+    let connection = endpoint.connect(node, EXAMPLE_ALPN).await?;
 
     let mut stream = match format {
         BlobFormat::HashSeq => {

examples/fetch-fsm.rs

@@ -14,7 +14,7 @@ use iroh_blobs::{format::collection::Collection, util::local_pool::LocalPool, Bl
 use tracing::warn;
 use tracing_subscriber::{prelude::*, EnvFilter};
 
-mod connect;
+const EXAMPLE_ALPN: &[u8] = b"n0/iroh/examples/bytes/0";
 
 // set the RUST_LOG env var to one of {debug,info,warn} to see logging info
 pub fn setup_logging() {
@@ -69,7 +69,7 @@ async fn main() -> Result<()> {
     // create an endpoint to listen for incoming connections
     let endpoint = iroh::Endpoint::builder()
         .relay_mode(iroh::RelayMode::Disabled)
-        .alpns(vec![connect::EXAMPLE_ALPN.into()])
+        .alpns(vec![EXAMPLE_ALPN.into()])
         .bind()
         .await?;
     let addr = endpoint.node_addr().await?;

examples/fetch-stream.rs

@@ -20,7 +20,7 @@ use std::{
 
 use anyhow::Result;
 use bao_tree::{io::fsm::BaoContentItem, ChunkNum};
-use iroh::endpoint::{self, RecvStream, SendStream};
+use iroh::endpoint::{self, ClosedStream, RecvStream, SendStream, WriteError};
 use serde::{Deserialize, Serialize};
 use tracing::{debug, error};
 
@@ -189,10 +189,10 @@ pub mod fsm {
         RequestTooBig,
         /// Error when writing the request to the [`SendStream`].
         #[error("write: {0}")]
-        Write(#[from] quinn::WriteError),
+        Write(#[from] WriteError),
         /// Quic connection is closed.
         #[error("closed")]
-        Closed(#[from] quinn::ClosedStream),
+        Closed(#[from] ClosedStream),
         /// A generic io error
         #[error("io {0}")]
         Io(io::Error),

examples/provide-bytes.rs

@@ -1,6 +1,6 @@
 //! Error returned from get operations
 
-use iroh::endpoint;
+use iroh::endpoint::{self, ClosedStream};
 
 use crate::util::progress::ProgressSendError;
 
@@ -73,7 +73,7 @@ impl From<endpoint::ConnectionError> for GetError {
                 // TODO(@divma): don't see how this is reachable but let's just not use the peer
                 GetError::Io(e.into())
             }
-            e @ quinn::ConnectionError::CidsExhausted => {
+            e @ ConnectionError::CidsExhausted => {
                 // > The connection could not be created because not enough of the CID space
                 // > is available
                 GetError::Io(e.into())
@@ -97,8 +97,8 @@ impl From<endpoint::ReadError> for GetError {
         }
     }
 }
-impl From<quinn::ClosedStream> for GetError {
-    fn from(value: quinn::ClosedStream) -> Self {
+impl From<ClosedStream> for GetError {
+    fn from(value: ClosedStream) -> Self {
         GetError::Io(value.into())
     }
 }