chore: Bump collab (#5136)

* chore: bump collab

* chore: bump collab

* chore: bump collab

* chore: fix test

* chore: disable supabse test
This commit is contained in:
Nathan.fooo
2024-04-15 14:50:28 +08:00
committed by GitHub
parent e9e483291e
commit d758e62c1a
41 changed files with 633 additions and 232 deletions

View File

@ -1,4 +1,4 @@
use collab::core::collab::DocStateSource;
use collab::core::collab::DataSource;
use collab_entity::{CollabObject, CollabType};
use uuid::Uuid;
@ -53,10 +53,11 @@ async fn supabase_create_database_test() {
assert_eq!(updates_by_oid.len(), 3);
for (_, source) in updates_by_oid {
match source {
DocStateSource::FromDisk => panic!("should not be from disk"),
DocStateSource::FromDocState(doc_state) => {
DataSource::Disk => panic!("should not be from disk"),
DataSource::DocStateV1(doc_state) => {
assert_eq!(doc_state.len(), 2);
},
DataSource::DocStateV2(_) => {},
}
}
}

View File

@ -2,8 +2,9 @@ use flowy_storage::ObjectStorageService;
use std::collections::HashMap;
use std::sync::Arc;
use collab::core::collab::{DocStateSource, MutexCollab};
use collab::core::collab::{DataSource, MutexCollab};
use collab::core::origin::CollabOrigin;
use collab::preclude::Collab;
use collab_plugins::cloud_storage::RemoteCollabStorage;
use uuid::Uuid;
@ -121,16 +122,16 @@ pub async fn print_encryption_folder_snapshot(
.await
.pop()
.unwrap();
let collab = Arc::new(
MutexCollab::new_with_doc_state(
let collab = Arc::new(MutexCollab::new(
Collab::new_with_source(
CollabOrigin::Empty,
folder_id,
DocStateSource::FromDocState(snapshot.blob),
DataSource::DocStateV1(snapshot.blob),
vec![],
false,
)
.unwrap(),
);
));
let folder_data = Folder::open(uid, collab, None)
.unwrap()
.get_folder_data()