Move EventLogType to sos-core.

Author: tmpfs

Cargo.lock

@@ -31,6 +31,22 @@ pub use read::ReadEvent;
 pub use record::EventRecord;
 pub use write::WriteEvent;
 
+/// Types of event logs.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum EventLogType {
+    /// Identity folder event log.
+    Identity,
+    /// Account event log.
+    Account,
+    /// Device event log.
+    Device,
+    /// Files event log.
+    #[cfg(feature = "files")]
+    Files,
+    /// Folder event log.
+    Folder(crate::VaultId),
+}
+
 /// Trait for events that can be written to an event log.
 pub trait LogEvent {
     /// Get the event kind for this event.

crates/core/src/events/mod.rs

@@ -55,6 +55,7 @@ sos-protocol = { workspace = true, features = ["network-client"] }
 sos-signer.workspace = true
 sos-sync.workspace = true
 sos-vault.workspace = true
+sos-vfs.workspace = true
 
 sos-audit = { workspace = true, optional = true }
 sos-search = { workspace = true, optional = true }

crates/net/Cargo.toml

@@ -16,22 +16,23 @@ use sos_core::{
     commit::{CommitHash, CommitState},
     AccountId, Origin, RemoteOrigins, SecretId, VaultId,
 };
+use sos_core::{
+    crypto::{AccessKey, Cipher, KeyDerivation},
+    device::{DevicePublicKey, TrustedDevice},
+    events::{EventLog, EventLogType, EventRecord},
+    AccountRef, Paths, PublicIdentity,
+};
+use sos_login::device::{DeviceManager, DeviceSigner};
 use sos_protocol::{
     AccountSync, DiffRequest, RemoteSync, RemoteSyncHandler, SyncClient,
     SyncOptions, SyncResult,
 };
-use sos_sdk::{
-    crypto::{AccessKey, Cipher, KeyDerivation},
-    device::{DeviceManager, DevicePublicKey, DeviceSigner, TrustedDevice},
-    events::{EventLog, EventRecord},
-    identity::{AccountRef, PublicIdentity},
-    vault::{
-        secret::{Secret, SecretMeta, SecretRow},
-        Summary, Vault, VaultCommit, VaultFlags,
-    },
-    vfs, Paths,
+use sos_sync::{CreateSet, StorageEventLogs, UpdateSet};
+use sos_vault::{
+    secret::{Secret, SecretMeta, SecretRow},
+    Summary, Vault, VaultCommit, VaultFlags,
 };
-use sos_sync::{CreateSet, EventLogType, StorageEventLogs, UpdateSet};
+use sos_vfs as vfs;
 use std::{
     collections::{HashMap, HashSet},
     path::{Path, PathBuf},

crates/net/src/account/network_account.rs

@@ -4,10 +4,9 @@ use crate::{decode_uuid, encode_uuid, Error, ProtoBinding, Result};
 use rs_merkle::{algorithms::Sha256, MerkleProof};
 use sos_core::{
     commit::{CommitHash, CommitProof, CommitState},
-    events::{patch::CheckedPatch, EventRecord},
+    events::{patch::CheckedPatch, EventLogType, EventRecord},
     SecretPath, UtcDateTime,
 };
-use sos_sync::EventLogType;
 use time::{Duration, OffsetDateTime};
 
 impl ProtoBinding for UtcDateTime {

crates/protocol/src/bindings/common.rs

@@ -3,9 +3,8 @@ include!(concat!(env!("OUT_DIR"), "/diff.rs"));
 use crate::{Error, ProtoBinding, Result};
 use sos_core::{
     commit::{CommitHash, CommitProof},
-    events::EventRecord,
+    events::{EventLogType, EventRecord},
 };
-use sos_sync::EventLogType;
 
 /// Request commit diff from an event log.
 #[derive(Debug, Clone, PartialEq, Eq)]

crates/protocol/src/bindings/diff.rs

@@ -3,9 +3,8 @@ include!(concat!(env!("OUT_DIR"), "/patch.rs"));
 use crate::{Error, ProtoBinding, Result};
 use sos_core::{
     commit::{CommitHash, CommitProof},
-    events::{patch::CheckedPatch, EventRecord},
+    events::{patch::CheckedPatch, EventLogType, EventRecord},
 };
-use sos_sync::EventLogType;
 
 /// Request to patch an event log from a specific commit.
 ///

crates/protocol/src/bindings/patch.rs

@@ -1,8 +1,7 @@
 include!(concat!(env!("OUT_DIR"), "/scan.rs"));
 
 use crate::{Error, ProtoBinding, Result};
-use sos_core::commit::CommitProof;
-use sos_sync::EventLogType;
+use sos_core::{commit::CommitProof, events::EventLogType};
 
 /// Request commit proofs from an event log.
 #[derive(Debug, Clone, PartialEq, Eq)]

crates/protocol/src/bindings/scan.rs

@@ -12,13 +12,14 @@ use sos_core::{
         patch::{
             AccountDiff, CheckedPatch, DeviceDiff, Diff, FolderDiff, Patch,
         },
-        AccountEvent, DeviceEvent, EventLog, EventRecord, WriteEvent,
+        AccountEvent, DeviceEvent, EventLog, EventLogType, EventRecord,
+        WriteEvent,
     },
     VaultId,
 };
 use sos_sync::{
-    EventLogType, ForceMerge, MaybeConflict, Merge, MergeOutcome,
-    StorageEventLogs, SyncDirection, SyncStatus,
+    ForceMerge, MaybeConflict, Merge, MergeOutcome, StorageEventLogs,
+    SyncDirection, SyncStatus,
 };
 use std::collections::HashSet;
 use tracing::instrument;

crates/protocol/src/sync/auto_merge.rs

@@ -2,18 +2,16 @@
 use binary_stream::futures::{Decodable, Encodable};
 use futures::{pin_mut, StreamExt};
 use sos_backend::BackendEventLog;
-use sos_core::events::EventLog;
 use sos_core::events::{
     patch::{AccountDiff, CheckedPatch, DeviceDiff, FolderDiff, Patch},
-    AccountEvent, DeviceEvent, EventRecord, WriteEvent,
+    AccountEvent, DeviceEvent, EventLog, EventLogType, EventRecord,
+    WriteEvent,
 };
 use sos_protocol::{
     DiffRequest, DiffResponse, PatchRequest, PatchResponse, ScanRequest,
     ScanResponse,
 };
-use sos_sync::{
-    EventLogType, MergeOutcome, StorageEventLogs, SyncPacket, SyncStorage,
-};
+use sos_sync::{MergeOutcome, StorageEventLogs, SyncPacket, SyncStorage};
 
 #[cfg(feature = "files")]
 use sos_core::events::{patch::FileDiff, FileEvent};

crates/storage/server/src/server_helpers.rs

@@ -12,7 +12,7 @@ use sos_core::{
             AccountDiff, AccountPatch, DeviceDiff, DevicePatch, FolderDiff,
             FolderPatch,
         },
-        AccountEvent, DeviceEvent, WriteEvent,
+        AccountEvent, DeviceEvent, EventLogType, WriteEvent,
     },
 };
 use std::collections::HashMap;
@@ -26,22 +26,6 @@ use sos_core::{
     ExternalFile, ExternalFileName, SecretPath,
 };
 
-/// Types of event logs.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum EventLogType {
-    /// Identity folder event log.
-    Identity,
-    /// Account event log.
-    Account,
-    /// Device event log.
-    Device,
-    /// Files event log.
-    #[cfg(feature = "files")]
-    Files,
-    /// Folder event log.
-    Folder(VaultId),
-}
-
 /// Combined sync status, diff and comparisons.
 #[derive(Debug, Default, Clone, PartialEq, Eq)]
 pub struct SyncPacket {

crates/sync/src/types.rs

@@ -1,10 +1,10 @@
 use crate::test_utils::{mock, simulate_device, spawn, teardown};
 use anyhow::Result;
 use sos_account::Account;
-use sos_core::commit::Comparison;
+use sos_core::{commit::Comparison, events::EventLogType};
 use sos_protocol::{RemoteSyncHandler, ScanRequest, SyncClient};
 use sos_sdk::prelude::*;
-use sos_sync::{EventLogType, StorageEventLogs};
+use sos_sync::StorageEventLogs;
 
 /// Tests scanning commit hashes on remote servers.
 #[tokio::test]

tests/integration/tests/auto_merge/scan_commits.rs

@@ -7,15 +7,16 @@ use sos_core::events::{
 };
 use sos_core::{
     commit::{CommitHash, CommitProof, CommitState},
+    events::EventLogType,
     AccountId, Origin, SecretPath, UtcDateTime, VaultId,
 };
 use sos_protocol::{
     DiffRequest, DiffResponse, PatchRequest, PatchResponse, ScanRequest,
     ScanResponse, WireEncodeDecode,
 };
 use sos_sync::{
-    CreateSet, EventLogType, MaybeDiff, MergeOutcome, SyncCompare, SyncDiff,
-    SyncPacket, SyncStatus, UpdateSet,
+    CreateSet, MaybeDiff, MergeOutcome, SyncCompare, SyncDiff, SyncPacket,
+    SyncStatus, UpdateSet,
 };
 
 const HASH: &str =