Merge branch 'main' into create-backup-server

src/backend.rs

@@ -132,6 +132,7 @@ impl Backend {
 
         let on_new_route_callback: OnNewRouteCallback = Arc::new(move |route_id, route_id_blob| {
             let inner = inner_clone.clone();
+            println!("Re-generating route");
             tokio::spawn(async move {
                 let inner = inner.lock().await;
 
@@ -159,7 +160,9 @@ impl Backend {
         });
 
         let (route_id, route_id_blob) = make_route(&veilid_api).await?;
-        let routing_context = veilid_api.routing_context()?;
+        let routing_context = veilid_api
+            .routing_context()?
+            .with_sequencing(veilid_core::Sequencing::EnsureOrdered);
 
         let mut inner = backend.inner.lock().await;
 
@@ -203,12 +206,15 @@ impl Backend {
         let (route_id, route_id_blob) = make_route(&veilid_api).await?;
 
         // Get veilid_api and routing_context
-        let routing_context = veilid_api.routing_context()?;
+        let routing_context = veilid_api
+            .routing_context()?
+            .with_sequencing(veilid_core::Sequencing::EnsureOrdered);
 
         let inner_clone = self.inner.clone();
 
         let on_new_route_callback: OnNewRouteCallback = Arc::new(move |route_id, route_id_blob| {
             let inner = inner_clone.clone();
+            println!("Re-generating route");
             tokio::spawn(async move {
                 let inner = inner.lock().await;
 

src/lib.rs

@@ -834,6 +834,8 @@ mod tests {
 
         let mut peer_repo = group.create_repo().await?;
 
+        sleep(Duration::from_secs(1)).await;
+
         let group2 = backend2.join_from_url(&group.get_url()).await?;
 
         // Upload a test blob to the peer repo
@@ -966,6 +968,8 @@ mod tests {
             "New collection hash after uploading a file should not be empty"
         );
 
+        sleep(Duration::from_secs(4)).await;
+
         let joined_group = backend2
             .join_from_url(&group1.get_url())
             .await

src/repo.rs

@@ -225,9 +225,8 @@ impl Repo {
     // Method to retrieve a file's hash from the collection
     pub async fn get_file_hash(&self, file_name: &str) -> Result<Hash> {
         // Ensure the collection exists before reading
-        self.get_or_create_collection().await?;
+        let collection_hash = self.get_or_create_collection().await?;
 
-        let collection_hash = self.get_collection_hash().await?;
         self.iroh_blobs
             .get_file_from_collection_hash(&collection_hash, file_name)
             .await