Debugging sync test.

Author: tmpfs

tests/integration/sync/mod.rs

@@ -48,6 +48,10 @@ pub async fn assert_local_remote_events_eq(
         writer.account_status().await?
     };
     let remote_status = provider.account_status().await?;
+        
+    println!("{:#?}", local_status);
+    println!("{:#?}", remote_status);
+
     assert_eq!(local_status, remote_status);
 
     Ok(())

tests/integration/sync/send_events.rs

@@ -40,7 +40,7 @@ async fn integration_sync_send_events() -> Result<()> {
     let (rx, _handle) = spawn()?;
     let _ = rx.await?;
 
-    let (mut owner, _, _default_folder, passphrase) =
+    let (mut owner, _, default_folder, passphrase) =
         create_local_account(
             "sync_basic_1",
             Some(test_data_dir.join("debug"))).await?;
@@ -96,7 +96,8 @@ async fn integration_sync_send_events() -> Result<()> {
     // the remote which should create the account on the remote
     owner.sync().await?;
 
-    let default_folder = owner.default_folder().await.unwrap();
+    println!("Default folder {}", default_folder.id());
+
     owner.open_folder(&default_folder).await?;
     other_owner.open_folder(&default_folder).await?;
 
@@ -113,7 +114,7 @@ async fn integration_sync_send_events() -> Result<()> {
     other_owner
         .create_secret(meta, secret, Default::default())
         .await?;
-
+    
     // Get the remote out of the owner so we can
     // assert on equality between local and remote
     let mut provider = owner.delete_remote(&remote_origin).unwrap();

tests/integration/test_utils/mod.rs

@@ -233,7 +233,7 @@ pub async fn create_local_account(
                     .save_passphrase(false)
                     .create_archive(true)
                     .create_authenticator(false)
-                    .create_contacts(true)
+                    .create_contacts(false)
                     .create_file_password(true)
             },
             None,

workspace/net/src/client/provider/remote_provider.rs

@@ -475,8 +475,9 @@ impl RemoteProvider {
 
         if num_events > 0 {
             let patch: Patch = decode(&body).await?;
-            println!("Apply remote patch to local {:#?}", patch);
-            panic!("Apply remote events to local");
+            let events = patch.into_events().await?;
+            let mut writer = self.local.write().await;
+            writer.patch(folder, events).await?;
         }
 
         Ok(())

workspace/sdk/src/events/mod.rs

@@ -1,5 +1,7 @@
 //! Log and sync events.
 
+use crate::{Error, Result};
+
 mod audit;
 mod change;
 mod event;
@@ -21,3 +23,15 @@ pub use write::WriteEvent;
 /// Patch wraps a changeset of events to be sent across the network.
 #[derive(Clone, Debug, Default)]
 pub struct Patch(pub Vec<EventRecord>);
+
+impl Patch {
+    /// Convert this patch into a collection of events.
+    pub async fn into_events(&self) -> Result<Vec<WriteEvent<'static>>> {
+        let mut events = Vec::new();
+        for record in &self.0 {
+            let event = record.decode_event().await?;
+            events.push(event);
+        }
+        Ok(events)
+    }
+}