Merge pull request #4549 from rklaehn/feat-iroh-0-5

Fix transfer test

Author: dignifiedquire

Cargo.lock

@@ -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,12 +194,13 @@ 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?;
         context.emit_event(SendProgress::ProviderListening.into());
         info!(context, "Waiting for remote to connect");
-        let ticket = provider.ticket(hash, Some(token)).await?;
+        let ticket = provider.ticket(hash).await?.with_token(Some(token));
         Ok((provider, ticket))
     }
 
@@ -500,7 +501,8 @@ async fn run_get_request(
     ticket: Ticket,
 ) -> anyhow::Result<Stats> {
     let opts = ticket.as_get_options(Keypair::generate(), Some(default_derp_map()));
-    let request = AnyGetRequest::Get(GetRequest::all(ticket.hash()));
+    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::*;