Tidy imports in account crate.

Author: tmpfs

Cargo.lock

@@ -31,7 +31,6 @@ contacts = ["dep:vcard4"]
 migrate = ["sos-migrate/import", "sos-migrate/export"]
 files = [
   "sos-external-files",
-  "sos-sdk/files",
   "sos-backend/files",
   "sos-login/files",
   "sos-client-storage/files",
@@ -41,7 +40,6 @@ search = ["sos-search", "sos-client-storage/search"]
 
 [dependencies]
 sos-core.workspace = true
-sos-sdk.workspace = true
 sos-backend.workspace = true
 sos-database.workspace = true
 sos-filesystem.workspace = true

crates/account/Cargo.toml

@@ -1,9 +1,9 @@
 //! Account storage and search index.
 use crate::{convert::CipherComparison, AccountBuilder, Error, Result};
-use sos_backend::compact::compact_folder;
+use indexmap::IndexSet;
 use sos_backend::{
-    reducers::FolderReducer, write_exclusive, AccessPoint, AccountEventLog,
-    StorageError,
+    compact::compact_folder, write_exclusive, AccessPoint, AccountEventLog,
+    BackendTarget, StorageError,
 };
 use sos_client_storage::{
     AccessOptions, AccountPack, ClientAccountStorage, ClientDeviceStorage,
@@ -13,22 +13,26 @@ use sos_client_storage::{
 use sos_core::{
     commit::{CommitHash, CommitState},
     crypto::{AccessKey, Cipher, KeyDerivation},
-    decode, encode,
+    decode,
+    device::{DevicePublicKey, TrustedDevice},
+    encode,
     events::{AccountEvent, Event, EventKind, ReadEvent, WriteEvent},
     events::{EventLog, EventRecord},
-    AccountId, SecretId, VaultCommit, VaultId,
+    AccountId, Paths, SecretId, UtcDateTime, VaultCommit, VaultId,
 };
-use sos_sdk::{
-    identity::{AccountRef, FolderKeys, Identity, PublicIdentity},
-    vfs, Paths, UtcDateTime,
+use sos_login::{
+    device::{DeviceManager, DeviceSigner},
+    AccountRef, FolderKeys, Identity, PublicIdentity,
 };
+use sos_reducers::FolderReducer;
 use sos_sync::{CreateSet, StorageEventLogs};
 use sos_vault::{
     list_accounts, list_local_folders,
     secret::{Secret, SecretMeta, SecretPath, SecretRow, SecretType},
     BuilderCredentials, Header, SecretAccess, Summary, Vault, VaultBuilder,
     VaultFlags,
 };
+use sos_vfs as vfs;
 use std::{
     borrow::Cow,
     collections::HashMap,
@@ -48,12 +52,6 @@ use {
 #[cfg(feature = "archive")]
 use sos_filesystem::archive::{Inventory, RestoreOptions};
 
-use sos_backend::BackendTarget;
-use sos_core::device::{DevicePublicKey, TrustedDevice};
-use sos_login::device::{DeviceManager, DeviceSigner};
-
-use indexmap::IndexSet;
-
 #[cfg(feature = "files")]
 use sos_external_files::FileMutationEvent;
 
@@ -1028,7 +1026,7 @@ impl LocalAccount {
         vault_id: &VaultId,
         new_key: AccessKey,
     ) -> Result<Vec<u8>> {
-        use sos_sdk::vault::ChangePassword;
+        use sos_vault::ChangePassword;
         let paths = self.paths().clone();
         // Get the current vault passphrase from the identity vault
         let current_key = self

crates/account/src/account.rs

@@ -1,6 +1,6 @@
 use crate::{Account, Error, LocalAccount, Result};
-use sos_core::AccountId;
-use sos_sdk::{prelude::PublicIdentity, Paths};
+use sos_core::{AccountId, Paths};
+use sos_login::PublicIdentity;
 use sos_vault::list_accounts;
 use std::path::PathBuf;
 use std::pin::Pin;
@@ -13,7 +13,7 @@ use sos_search::{ArchiveFilter, Document, DocumentView, QueryFilter};
 use {crate::ClipboardCopyRequest, xclipboard::Clipboard};
 
 #[cfg(feature = "clipboard")]
-use sos_sdk::prelude::SecretPath;
+use sos_core::SecretPath;
 
 /// Account switcher for local accounts.
 pub type LocalAccountSwitcher = AccountSwitcher<

crates/account/src/account_switcher.rs

@@ -11,7 +11,7 @@ use sos_core::{
     crypto::AccessKey,
     AccountId, Paths, SecretId, VaultFlags,
 };
-use sos_sdk::identity::{FolderKeys, Identity, IdentityFolder};
+use sos_login::{FolderKeys, Identity, IdentityFolder};
 use sos_vault::{
     secret::{Secret, SecretMeta, SecretRow},
     AccessPoint, BuilderCredentials, SecretAccess, Summary, Vault,

crates/account/src/builder.rs

@@ -2,7 +2,7 @@
 use crate::{Account, Error, LocalAccount, Result};
 use serde::{Deserialize, Serialize};
 use sos_backend::AccessPoint;
-use sos_sdk::{
+use sos_core::{
     crypto::{AccessKey, Cipher, KeyDerivation},
     decode, encode,
 };

crates/account/src/convert.rs

@@ -1,6 +1,5 @@
 //! Errors generated by the account library.
-use sos_core::VaultId;
-use sos_sdk::prelude::ErrorExt;
+use sos_core::{ErrorExt, VaultId};
 use std::path::PathBuf;
 use thiserror::Error;
 

crates/account/src/error.rs

@@ -1,24 +1,22 @@
 //! Implements merging for folders.
 use crate::Result;
 use async_trait::async_trait;
-use sos_backend::reducers::FolderReducer;
 use sos_backend::Folder;
 use sos_core::{
     events::{
         patch::{CheckedPatch, FolderDiff},
-        LogEvent, WriteEvent,
+        EventLog, LogEvent, WriteEvent,
     },
     VaultId,
 };
-use sos_sdk::{
-    events::EventLog, identity::IdentityFolder, vault::secret::SecretRow,
-};
-use sos_vault::SecretAccess;
+use sos_login::IdentityFolder;
+use sos_reducers::FolderReducer;
+use sos_vault::{secret::SecretRow, SecretAccess};
 
 /// Options for folder merge.
 pub(crate) enum FolderMergeOptions<'a> {
     /// Update a URN lookup when merging.
-    Urn(VaultId, &'a mut sos_sdk::identity::UrnLookup),
+    Urn(VaultId, &'a mut sos_login::UrnLookup),
     /// Update a search index when merging.
     #[cfg(feature = "search")]
     Search(VaultId, &'a mut sos_search::SearchIndex),

crates/account/src/folder_sync.rs

@@ -306,7 +306,7 @@ impl Merge for LocalAccount {
         diff: FileDiff,
         outcome: &mut MergeOutcome,
     ) -> Result<CheckedPatch> {
-        use sos_backend::reducers::FileReducer;
+        use sos_reducers::FileReducer;
         tracing::debug!(
             checkpoint = ?diff.checkpoint,
             num_events = diff.patch.len(),