diff --git a/Cargo.lock b/Cargo.lock index d8c1b4cfe..0b3222278 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1198,9 +1198,9 @@ dependencies = [ [[package]] name = "default-net" -version = "0.16.1" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae47401ee27418babbf80e20de5ff240a19c850ec6000326342cdb198b341687" +checksum = "cfe553014b8511f63a1324f7cc9b91cf0117289321ad14b4781ef4fed005f30c" dependencies = [ "dlopen2", "libc", @@ -2623,7 +2623,7 @@ checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "iroh" version = "0.4.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#58d42ba7da1f3eca199f4952643d1de6ac812664" +source = "git+https://github.com/n0-computer/iroh?branch=main#456f96305954a23299d02ed65b8838ba168232e1" dependencies = [ "anyhow", "bao-tree", @@ -2649,13 +2649,14 @@ dependencies = [ "tokio-stream", "tokio-util", "tracing", + "url", "walkdir", ] [[package]] name = "iroh-bytes" version = "0.4.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#58d42ba7da1f3eca199f4952643d1de6ac812664" +source = "git+https://github.com/n0-computer/iroh?branch=main#456f96305954a23299d02ed65b8838ba168232e1" dependencies = [ "anyhow", "bao-tree", @@ -2703,7 +2704,7 @@ dependencies = [ [[package]] name = "iroh-metrics" version = "0.4.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#58d42ba7da1f3eca199f4952643d1de6ac812664" +source = "git+https://github.com/n0-computer/iroh?branch=main#456f96305954a23299d02ed65b8838ba168232e1" dependencies = [ "erased_set", "hyper", @@ -2717,7 +2718,7 @@ dependencies = [ [[package]] name = "iroh-net" version = "0.4.1" -source = "git+https://github.com/n0-computer/iroh?branch=main#58d42ba7da1f3eca199f4952643d1de6ac812664" +source = "git+https://github.com/n0-computer/iroh?branch=main#456f96305954a23299d02ed65b8838ba168232e1" dependencies = [ "anyhow", "backoff", diff --git a/src/imex/transfer.rs b/src/imex/transfer.rs index 34018a394..f4e98c4ee 100644 --- a/src/imex/transfer.rs +++ b/src/imex/transfer.rs @@ -40,7 +40,7 @@ use iroh::bytes::get::{fsm, Stats}; use iroh::bytes::protocol::{AnyGetRequest, GetRequest, RequestToken}; use iroh::bytes::provider::Event as ProviderEvent; use iroh::bytes::util::runtime; -use iroh::collection::Collection; +use iroh::collection::{Collection, IrohCollectionParser}; use iroh::database::flat::DataSource; use iroh::dial::Ticket; use iroh::net::defaults::default_derp_map; @@ -194,6 +194,7 @@ impl BackupProvider { let provider = Node::builder(db) .bind_addr((Ipv4Addr::UNSPECIFIED, 0).into()) .custom_auth_handler(Arc::new(auth_token_handler)) + .collection_parser(IrohCollectionParser) .runtime(&rt) .spawn() .await?; @@ -500,8 +501,8 @@ async fn run_get_request( ticket: Ticket, ) -> anyhow::Result { let opts = ticket.as_get_options(Keypair::generate(), Some(default_derp_map())); - let request = AnyGetRequest::Get(GetRequest::all(ticket.hash())) - .with_token(ticket.token().cloned()); + let request = + AnyGetRequest::Get(GetRequest::all(ticket.hash())).with_token(ticket.token().cloned()); let connection = iroh::dial::dial(opts).await?; let initial = fsm::start(connection, request); use fsm::*;