Remove reducers re-export.

crates/backend/src/compact.rs

@@ -1,13 +1,12 @@
 //! Compact folders.
-use crate::{
-    reducers::FolderReducer, BackendEventLog, Error, FolderEventLog, Result,
-};
+use crate::{BackendEventLog, Error, FolderEventLog, Result};
 use sos_core::events::{
     patch::{FolderDiff, Patch},
     EventLog, EventRecord,
 };
 use sos_database::db::open_memory;
 use sos_filesystem::FolderEventLog as FsFolderEventLog;
+use sos_reducers::FolderReducer;
 use tempfile::NamedTempFile;
 
 /// Compact a folder event log.

crates/backend/src/folder.rs

@@ -1,7 +1,5 @@
 //! Folder combines an access point with an event log.
-use crate::{
-    reducers::FolderReducer, AccessPoint, Error, FolderEventLog, Result,
-};
+use crate::{AccessPoint, Error, FolderEventLog, Result};
 use sos_core::{
     commit::{CommitHash, CommitState},
     crypto::AccessKey,
@@ -17,6 +15,7 @@ use sos_database::{
     VaultDatabaseWriter,
 };
 use sos_filesystem::VaultFileWriter;
+use sos_reducers::FolderReducer;
 use sos_vault::{
     secret::{Secret, SecretId, SecretMeta, SecretRow},
     AccessPoint as VaultAccessPoint, EncryptedEntry, SecretAccess, Vault,

crates/backend/src/lib.rs

@@ -16,16 +16,8 @@ mod server_origins;
 mod system_messages;
 mod vault_writer;
 
-pub use error::{Error, StorageError};
-use sos_core::{AccountId, PublicIdentity};
-pub use sos_database as database;
-use sos_database::db::{
-    AccountEntity, AccountRecord, FolderEntity, FolderRecord,
-};
-pub use sos_filesystem::write_exclusive;
-pub use sos_reducers as reducers;
-
 pub use access_point::BackendAccessPoint as AccessPoint;
+pub use error::{Error, StorageError};
 pub use event_log::{
     BackendAccountEventLog as AccountEventLog,
     BackendDeviceEventLog as DeviceEventLog, BackendEventLog,
@@ -35,6 +27,8 @@ pub use folder::Folder;
 #[cfg(feature = "preferences")]
 pub use preferences::BackendPreferences as Preferences;
 pub use server_origins::ServerOrigins;
+pub use sos_database as database;
+pub use sos_filesystem::write_exclusive;
 use sos_vault::Summary;
 #[cfg(feature = "system-messages")]
 pub use system_messages::SystemMessages;
@@ -46,6 +40,11 @@ pub use event_log::BackendFileEventLog as FileEventLog;
 /// Result type for the library.
 pub(crate) type Result<T> = std::result::Result<T, Error>;
 
+use sos_core::{AccountId, PublicIdentity};
+use sos_database::db::{
+    AccountEntity, AccountRecord, FolderEntity, FolderRecord,
+};
+
 /// Target backend.
 #[derive(Clone)]
 pub enum BackendTarget {

crates/sos/Cargo.toml

@@ -33,6 +33,7 @@ sos-password.workspace = true
 sos-protocol = { workspace = true, features = ["full"] }
 sos-net = { workspace = true, features = ["full"] }
 sos-migrate.workspace = true
+sos-reducers.workspace = true
 sos-sdk = { workspace = true, features = ["full"] }
 sos-preferences.workspace = true
 sos-security-report.workspace = true

crates/sos/src/commands/tools/mod.rs

@@ -9,8 +9,9 @@ use crate::{
 };
 use clap::Subcommand;
 use sos_account::Account;
-use sos_backend::{reducers::FolderReducer, FolderEventLog};
+use sos_backend::FolderEventLog;
 use sos_core::VaultId;
+use sos_reducers::FolderReducer;
 use sos_sdk::{
     constants::EVENT_LOG_EXT,
     crypto::{AccessKey, Cipher, KeyDerivation},

crates/storage/client/src/filesystem/mod.rs

@@ -9,9 +9,9 @@ use futures::{pin_mut, StreamExt};
 use indexmap::IndexSet;
 use parking_lot::Mutex;
 use sos_backend::{
-    reducers::FolderReducer, write_exclusive, Folder, StorageError,
+    compact::compact_folder, write_exclusive, AccountEventLog,
+    DeviceEventLog, Folder, FolderEventLog, StorageError,
 };
-use sos_backend::{AccountEventLog, DeviceEventLog, FolderEventLog};
 use sos_core::{
     commit::{CommitHash, CommitState},
     SecretId, VaultId,
@@ -28,6 +28,7 @@ use sos_core::{
 };
 use sos_login::{FolderKeys, Identity};
 use sos_password::diceware::generate_passphrase;
+use sos_reducers::{DeviceReducer, FolderReducer};
 use sos_vault::{
     secret::{Secret, SecretMeta, SecretRow},
     BuilderCredentials, ChangePassword, FolderRef, Header, SecretAccess,
@@ -52,8 +53,6 @@ use sos_core::{
     events::DeviceEvent,
 };
 
-use sos_backend::{compact::compact_folder, reducers::DeviceReducer};
-
 #[cfg(feature = "files")]
 use {sos_backend::FileEventLog, sos_core::events::FileEvent};
 

crates/storage/server/Cargo.toml

@@ -13,6 +13,7 @@ audit = ["sos-audit", "sos-backend/audit"]
 files = [
   "sos-external-files",
   "sos-backend/files",
+  "sos-reducers/files",
   "sos-sync/files",
 ]
 
@@ -22,6 +23,7 @@ sos-backend.workspace = true
 sos-database.workspace = true
 sos-filesystem.workspace = true
 sos-protocol.workspace = true
+sos-reducers.workspace = true
 sos-signer.workspace = true
 sos-sync.workspace = true
 sos-vault.workspace = true

crates/storage/server/src/database/mod.rs

@@ -2,23 +2,24 @@
 use crate::{Error, Result, ServerAccountStorage};
 use async_trait::async_trait;
 use indexmap::IndexSet;
-use sos_backend::reducers::{DeviceReducer, FolderReducer};
-use sos_backend::VaultWriter;
 use sos_backend::{
     AccountEventLog, DeviceEventLog, FileEventLog, FolderEventLog,
-};
-use sos_core::events::{
-    patch::FolderPatch, AccountEvent, EventLog, EventRecord, WriteEvent,
+    VaultWriter,
 };
 use sos_core::{
     decode,
     device::{DevicePublicKey, TrustedDevice},
-    encode, AccountId, Paths, VaultId,
+    encode,
+    events::{
+        patch::FolderPatch, AccountEvent, EventLog, EventRecord, WriteEvent,
+    },
+    AccountId, Paths, VaultId,
 };
 use sos_database::async_sqlite::Client;
 use sos_database::db::{
     AccountEntity, AccountRow, FolderEntity, FolderRecord, FolderRow,
 };
+use sos_reducers::{DeviceReducer, FolderReducer};
 use sos_sync::{CreateSet, ForceMerge, MergeOutcome, UpdateSet};
 use sos_vault::{EncryptedEntry, Summary, Vault};
 use sos_vfs as vfs;

crates/storage/server/src/database/sync.rs

@@ -3,11 +3,9 @@ use crate::{database::ServerDatabaseStorage, ServerAccountStorage};
 use crate::{Error, Result};
 use async_trait::async_trait;
 use indexmap::IndexSet;
-use sos_backend::reducers::DeviceReducer;
-use sos_backend::VaultWriter;
 use sos_backend::{
-    reducers::FolderReducer, AccountEventLog, DeviceEventLog, FileEventLog,
-    FolderEventLog,
+    AccountEventLog, DeviceEventLog, FileEventLog, FolderEventLog,
+    VaultWriter,
 };
 use sos_core::{
     events::{
@@ -21,6 +19,7 @@ use sos_core::{
 use sos_database::db::{
     AccountEntity, FolderEntity, FolderRecord, FolderRow,
 };
+use sos_reducers::{DeviceReducer, FolderReducer};
 use sos_sync::{
     ForceMerge, Merge, MergeOutcome, StorageEventLogs, SyncStorage,
     TrackedChanges,

crates/storage/server/src/filesystem/mod.rs

@@ -2,24 +2,27 @@
 use crate::{Error, Result, ServerAccountStorage};
 use async_trait::async_trait;
 use indexmap::IndexSet;
-use sos_backend::reducers::DeviceReducer;
-use sos_backend::reducers::FolderReducer;
-use sos_backend::VaultWriter;
 use sos_backend::{
     AccountEventLog, DeviceEventLog, FileEventLog, FolderEventLog,
+    VaultWriter,
 };
-use sos_core::events::{patch::FolderPatch, AccountEvent, EventLog};
 use sos_core::{
     constants::VAULT_EXT,
     decode,
     device::{DevicePublicKey, TrustedDevice},
-    encode, AccountId, Paths, VaultId,
+    encode,
+    events::{patch::FolderPatch, AccountEvent, EventLog},
+    AccountId, Paths, VaultId,
 };
+use sos_reducers::{DeviceReducer, FolderReducer};
 use sos_sync::{CreateSet, ForceMerge, MergeOutcome, UpdateSet};
 use sos_vault::{EncryptedEntry, Header, Summary, Vault};
 use sos_vfs as vfs;
-use std::collections::HashSet;
-use std::{collections::HashMap, path::PathBuf, sync::Arc};
+use std::{
+    collections::{HashMap, HashSet},
+    path::PathBuf,
+    sync::Arc,
+};
 use tokio::sync::RwLock;
 
 #[cfg(feature = "audit")]

crates/storage/server/src/filesystem/sync.rs

@@ -3,11 +3,9 @@ use crate::{filesystem::ServerFileStorage, ServerAccountStorage};
 use crate::{Error, Result};
 use async_trait::async_trait;
 use indexmap::IndexSet;
-use sos_backend::reducers::DeviceReducer;
-use sos_backend::VaultWriter;
 use sos_backend::{
-    reducers::FolderReducer, AccountEventLog, DeviceEventLog, FileEventLog,
-    FolderEventLog,
+    AccountEventLog, DeviceEventLog, FileEventLog, FolderEventLog,
+    VaultWriter,
 };
 use sos_core::{
     encode,
@@ -19,6 +17,7 @@ use sos_core::{
     },
     VaultId,
 };
+use sos_reducers::{DeviceReducer, FolderReducer};
 use sos_sync::{
     ForceMerge, Merge, MergeOutcome, StorageEventLogs, SyncStorage,
     TrackedChanges,

crates/sync/Cargo.toml

@@ -15,11 +15,13 @@ rustdoc-args = ["--cfg", "docsrs"]
 full = ["files"]
 files = [
   "sos-backend/files",
+  "sos-reducers/files",
 ]
 
 [dependencies]
 sos-core.workspace = true
 sos-backend.workspace = true
+sos-reducers.workspace = true
 sos-vault.workspace = true
 
 thiserror.workspace = true

crates/sync/src/traits.rs

@@ -69,7 +69,7 @@ pub trait StorageEventLogs: Send + Sync + 'static {
     async fn canonical_files(
         &self,
     ) -> Result<IndexSet<ExternalFile>, Self::Error> {
-        use sos_backend::reducers::FileReducer;
+        use sos_reducers::FileReducer;
         let files = self.file_log().await?;
         let event_log = files.read().await;
 

tests/unit/Cargo.toml

@@ -27,6 +27,7 @@ sos-migrate = { workspace = true, features = ["full"] }
 sos-net = { workspace = true, features = ["full"] }
 sos-protocol = { workspace = true, features = ["full"] }
 sos-recovery.workspace = true
+sos-reducers.workspace = true
 sos-preferences.workspace = true
 sos-search.workspace = true
 sos-signer.workspace = true

tests/unit/src/tests/sdk/reducer.rs

@@ -1,11 +1,11 @@
 use anyhow::Result;
 use secrecy::ExposeSecret;
-use sos_backend::reducers::FolderReducer;
 use sos_backend::FolderEventLog;
 use sos_core::{
     crypto::PrivateKey, decode, events::EventLog, SecretId, VaultCommit,
     VaultEntry,
 };
+use sos_reducers::FolderReducer;
 use sos_test_utils::mock;
 use sos_vault::{
     secret::{Secret, SecretMeta},