From 2dd561dfe301db6af9a5113b9ca0b41a267bca5d Mon Sep 17 00:00:00 2001 From: muji Date: Mon, 27 Nov 2023 14:18:52 +0800 Subject: [PATCH] Rename type. --- src/commands/account.rs | 4 +- src/commands/secret.rs | 2 +- src/helpers/secret.rs | 3 +- tests/integration/account_manager.rs | 22 +++++----- tests/integration/archive_export_restore.rs | 4 +- tests/integration/local_provider.rs | 6 +-- tests/integration/test_utils.rs | 43 +++++++++---------- workspace/migrate/src/import/csv/bitwarden.rs | 2 +- workspace/migrate/src/import/csv/chrome.rs | 2 +- workspace/migrate/src/import/csv/dashlane.rs | 2 +- workspace/migrate/src/import/csv/firefox.rs | 2 +- workspace/migrate/src/import/csv/macos.rs | 2 +- .../migrate/src/import/csv/one_password.rs | 2 +- workspace/net/src/client/account/remote.rs | 8 ++-- .../net/src/client/account/user_storage.rs | 35 +++++++-------- workspace/net/src/server/services/events.rs | 3 +- workspace/sdk/src/account/account.rs | 22 +++++----- workspace/sdk/src/account/archive/backup.rs | 2 +- workspace/sdk/src/account/builder.rs | 1 - workspace/sdk/src/account/contacts.rs | 2 +- .../sdk/src/account/files/file_manager.rs | 7 +-- workspace/sdk/src/account/files/mod.rs | 2 +- workspace/sdk/src/account/login.rs | 5 ++- workspace/sdk/src/account/mod.rs | 5 +-- workspace/sdk/src/account/provider.rs | 11 +++-- workspace/sdk/src/account/search/mod.rs | 11 +++-- workspace/sdk/src/events/log/file.rs | 5 +-- workspace/sdk/src/events/log/mod.rs | 20 ++++----- workspace/sdk/src/events/mod.rs | 4 +- workspace/sdk/src/lib.rs | 2 +- 30 files changed, 116 insertions(+), 125 deletions(-) diff --git a/src/commands/account.rs b/src/commands/account.rs index 7c13d4aa78..a4a9a0378b 100644 --- a/src/commands/account.rs +++ b/src/commands/account.rs @@ -10,7 +10,7 @@ use sos_net::{ AccountBackup, ExtractFilesLocation, Inventory, RestoreOptions, }, - AccountInfo, AccountRef, LocalProvider, UserPaths, + AccountInfo, AccountRef, FolderStorage, UserPaths, }, vfs, }, @@ -403,7 +403,7 @@ async fn account_restore(input: PathBuf) -> Result> { let account_ref = AccountRef::Address(inventory.manifest.address); let account = find_account(&account_ref).await?; - let provider: Option>> = + let provider: Option>> = if let Some(account) = account { let confirmed = read_flag(Some( "Overwrite all account data from backup? (y/n) ", diff --git a/src/commands/secret.rs b/src/commands/secret.rs index c091fe042a..bc656689ea 100644 --- a/src/commands/secret.rs +++ b/src/commands/secret.rs @@ -7,7 +7,7 @@ use terminal_banner::{Banner, Padding}; use sos_net::sdk::{ account::{ - search::{ArchiveFilter, DocumentView, Document}, + search::{ArchiveFilter, Document, DocumentView}, AccountRef, }, vault::{ diff --git a/src/helpers/secret.rs b/src/helpers/secret.rs index 05ccc4a98b..d2f363cb4f 100644 --- a/src/helpers/secret.rs +++ b/src/helpers/secret.rs @@ -9,9 +9,8 @@ use terminal_banner::{Banner, Padding}; use secrecy::{ExposeSecret, SecretString}; use sos_net::sdk::{ - hex, account::search::Document, - secrecy, + hex, secrecy, url::Url, vault::{ secret::{FileContent, Secret, SecretId, SecretMeta, SecretRef}, diff --git a/tests/integration/account_manager.rs b/tests/integration/account_manager.rs index b31cf3a90a..798ab758d0 100644 --- a/tests/integration/account_manager.rs +++ b/tests/integration/account_manager.rs @@ -6,9 +6,8 @@ use sos_net::sdk::{ account::{ archive::{AccountBackup, ExtractFilesLocation, RestoreOptions}, files::FileStorage, - Account, DelegatedPassphrase, AccountsList, - LocalProvider, search::SearchIndex, + Account, AccountsList, DelegatedPassphrase, FolderStorage, }, hex, passwd::diceware::generate_passphrase, @@ -29,14 +28,13 @@ async fn integration_account_manager() -> Result<()> { let account_name = TEST_ID.to_string(); let (passphrase, _) = generate_passphrase()?; - let (mut account, new_account) = - Account::<()>::new_account( - account_name.clone(), - passphrase.clone(), - Some(test_data_dir.clone()), - None, - ) - .await?; + let (mut account, new_account) = Account::<()>::new_account( + account_name.clone(), + passphrase.clone(), + Some(test_data_dir.clone()), + None, + ) + .await?; account.sign_in(passphrase.clone()).await?; @@ -49,7 +47,7 @@ async fn integration_account_manager() -> Result<()> { let accounts = AccountsList::list_accounts(Some(&paths)).await?; assert_eq!(1, accounts.len()); let user = account.user()?; - + let address = new_account.address.clone(); let summary = new_account.default_folder().clone(); @@ -142,7 +140,7 @@ async fn integration_account_manager() -> Result<()> { // Restore from archive whilst signed in (with provider), // overwrites existing data (backup) let signer = user.identity().signer().clone(); - let mut provider = LocalProvider::new( + let mut provider = FolderStorage::new( signer.address()?.to_string(), Some(test_data_dir.clone()), ) diff --git a/tests/integration/archive_export_restore.rs b/tests/integration/archive_export_restore.rs index a835346aff..1fb833b107 100644 --- a/tests/integration/archive_export_restore.rs +++ b/tests/integration/archive_export_restore.rs @@ -9,7 +9,7 @@ use tempfile::tempdir; use sos_net::sdk::{ account::{ archive::{AccountBackup, RestoreOptions, Writer}, - Identity, LocalProvider, + FolderStorage, Identity, }, encode, events::WriteEvent, @@ -30,7 +30,7 @@ async fn integration_archive_local_provider() -> Result<()> { let user_id = signer.address()?.to_string(); let passphrase = SecretString::new("mock-password".to_owned()); let mut storage = - LocalProvider::new(user_id, Some(dir.path().to_path_buf())).await?; + FolderStorage::new(user_id, Some(dir.path().to_path_buf())).await?; // Prepare a vault to add to the archive let default_vault = VaultBuilder::new() diff --git a/tests/integration/local_provider.rs b/tests/integration/local_provider.rs index eb82bbdffe..b532363cca 100644 --- a/tests/integration/local_provider.rs +++ b/tests/integration/local_provider.rs @@ -6,7 +6,7 @@ use tempfile::tempdir; use secrecy::ExposeSecret; use sos_net::sdk::{ - account::LocalProvider, + account::FolderStorage, events::WriteEvent, signer::{ecdsa::SingleParty, Signer}, vault::secret::{Secret, SecretData}, @@ -29,12 +29,12 @@ async fn integration_local_provider_file() -> Result<()> { let signer = Box::new(SingleParty::new_random()); let user_id = signer.address()?.to_string(); let mut storage = - LocalProvider::new(user_id, Some(dir.path().to_path_buf())).await?; + FolderStorage::new(user_id, Some(dir.path().to_path_buf())).await?; run_local_storage_tests(&mut storage).await?; Ok(()) } -async fn run_local_storage_tests(storage: &mut LocalProvider) -> Result<()> { +async fn run_local_storage_tests(storage: &mut FolderStorage) -> Result<()> { // Create an account with default login vault let (_, passphrase, _) = storage.create_account(None, None).await?; diff --git a/tests/integration/test_utils.rs b/tests/integration/test_utils.rs index 272d3a781e..0526f7142e 100644 --- a/tests/integration/test_utils.rs +++ b/tests/integration/test_utils.rs @@ -12,7 +12,7 @@ use web3_address::ethereum::Address; use sos_net::{ client::{Origin, RemoteBridge, RemoteSync, UserStorage}, sdk::{ - account::LocalProvider, + account::FolderStorage, crypto::AccessKey, events::{AuditLogFile, WriteEvent}, hex, @@ -63,7 +63,7 @@ async fn remote_bridge( ) -> Result { let keypair = Keypair::new(PATTERN.parse()?)?; let local = - LocalProvider::new(signer.address()?.to_string(), data_dir).await?; + FolderStorage::new(signer.address()?.to_string(), data_dir).await?; let provider = RemoteBridge::new( Arc::new(RwLock::new(local)), origin.clone(), @@ -304,22 +304,21 @@ pub async fn create_local_account( data_dir: Option, ) -> Result<(UserStorage, Summary, SecretString)> { let (passphrase, _) = generate_passphrase()?; - let (mut owner, new_account) = - UserStorage::new_account_with_builder( - account_name.to_owned(), - passphrase.clone(), - |builder| { - builder - .save_passphrase(false) - .create_archive(true) - .create_authenticator(false) - .create_contacts(true) - .create_file_password(true) - }, - data_dir, - None, - ) - .await?; + let (mut owner, new_account) = UserStorage::new_account_with_builder( + account_name.to_owned(), + passphrase.clone(), + |builder| { + builder + .save_passphrase(false) + .create_archive(true) + .create_authenticator(false) + .create_contacts(true) + .create_file_password(true) + }, + data_dir, + None, + ) + .await?; let summary = new_account.default_folder().clone(); @@ -341,7 +340,7 @@ pub fn mock_note(label: &str, text: &str) -> (SecretMeta, Secret) { } pub async fn create_secrets( - provider: &mut LocalProvider, + provider: &mut FolderStorage, summary: &Summary, ) -> Result> { let notes = vec![ @@ -379,7 +378,7 @@ pub async fn create_secrets( } pub async fn delete_secret( - provider: &mut LocalProvider, + provider: &mut FolderStorage, summary: &Summary, id: &SecretId, ) -> Result<()> { @@ -425,10 +424,10 @@ async fn create_account( pub async fn create_local_provider( signer: BoxedEcdsaSigner, data_dir: Option, -) -> Result<(AccountCredentials, LocalProvider)> { +) -> Result<(AccountCredentials, FolderStorage)> { let address = signer.address()?; let mut provider = - LocalProvider::new(address.to_string(), data_dir).await?; + FolderStorage::new(address.to_string(), data_dir).await?; let (_, encryption_passphrase, summary) = provider.create_account(None, None).await?; let account = AccountCredentials { diff --git a/workspace/migrate/src/import/csv/bitwarden.rs b/workspace/migrate/src/import/csv/bitwarden.rs index d96b28935a..789382d730 100644 --- a/workspace/migrate/src/import/csv/bitwarden.rs +++ b/workspace/migrate/src/import/csv/bitwarden.rs @@ -148,8 +148,8 @@ mod test { use tokio::sync::RwLock; use sos_sdk::{ - passwd::diceware::generate_passphrase, account::search::SearchIndex, + passwd::diceware::generate_passphrase, vault::{Gatekeeper, VaultBuilder}, }; use std::sync::Arc; diff --git a/workspace/migrate/src/import/csv/chrome.rs b/workspace/migrate/src/import/csv/chrome.rs index fcb54d2923..b74346b242 100644 --- a/workspace/migrate/src/import/csv/chrome.rs +++ b/workspace/migrate/src/import/csv/chrome.rs @@ -98,8 +98,8 @@ mod test { use tokio::sync::RwLock; use sos_sdk::{ - passwd::diceware::generate_passphrase, account::search::SearchIndex, + passwd::diceware::generate_passphrase, vault::{Gatekeeper, VaultBuilder}, }; use std::sync::Arc; diff --git a/workspace/migrate/src/import/csv/dashlane.rs b/workspace/migrate/src/import/csv/dashlane.rs index 9364bc8a84..41b927e37f 100644 --- a/workspace/migrate/src/import/csv/dashlane.rs +++ b/workspace/migrate/src/import/csv/dashlane.rs @@ -661,8 +661,8 @@ mod test { use tokio::sync::RwLock; use sos_sdk::{ - passwd::diceware::generate_passphrase, account::search::SearchIndex, + passwd::diceware::generate_passphrase, vault::{secret::Secret, Gatekeeper, VaultBuilder}, }; use std::sync::Arc; diff --git a/workspace/migrate/src/import/csv/firefox.rs b/workspace/migrate/src/import/csv/firefox.rs index 7012bd1d80..c4b04458dc 100644 --- a/workspace/migrate/src/import/csv/firefox.rs +++ b/workspace/migrate/src/import/csv/firefox.rs @@ -104,8 +104,8 @@ mod test { use tokio::sync::RwLock; use sos_sdk::{ - passwd::diceware::generate_passphrase, account::search::SearchIndex, + passwd::diceware::generate_passphrase, vault::{Gatekeeper, VaultBuilder}, }; use std::sync::Arc; diff --git a/workspace/migrate/src/import/csv/macos.rs b/workspace/migrate/src/import/csv/macos.rs index 03c4c20acb..723aab6e71 100644 --- a/workspace/migrate/src/import/csv/macos.rs +++ b/workspace/migrate/src/import/csv/macos.rs @@ -106,8 +106,8 @@ mod test { use tokio::sync::RwLock; use sos_sdk::{ - passwd::diceware::generate_passphrase, account::search::SearchIndex, + passwd::diceware::generate_passphrase, vault::{Gatekeeper, VaultBuilder}, }; use std::sync::Arc; diff --git a/workspace/migrate/src/import/csv/one_password.rs b/workspace/migrate/src/import/csv/one_password.rs index c6cd23cf96..5ed61ed966 100644 --- a/workspace/migrate/src/import/csv/one_password.rs +++ b/workspace/migrate/src/import/csv/one_password.rs @@ -167,8 +167,8 @@ mod test { use tokio::sync::RwLock; use sos_sdk::{ - passwd::diceware::generate_passphrase, account::search::SearchIndex, + passwd::diceware::generate_passphrase, vault::{Gatekeeper, VaultBuilder}, }; use std::sync::Arc; diff --git a/workspace/net/src/client/account/remote.rs b/workspace/net/src/client/account/remote.rs index fbfec502a7..c3c5e44439 100644 --- a/workspace/net/src/client/account/remote.rs +++ b/workspace/net/src/client/account/remote.rs @@ -12,7 +12,7 @@ use async_trait::async_trait; use http::StatusCode; use sos_sdk::{ - account::{AccountStatus, LocalProvider}, + account::{AccountStatus, FolderStorage}, commit::{CommitHash, CommitProof, CommitState, Comparison}, crypto::SecureAccessKey, decode, @@ -58,7 +58,7 @@ pub struct RemoteBridge { /// Origin for this remote. origin: Origin, /// Local provider. - local: Arc>, + local: Arc>, /// Client to use for remote communication. remote: RpcClient, } @@ -67,7 +67,7 @@ impl RemoteBridge { /// Create a new remote bridge that wraps the given /// local provider. pub fn new( - local: Arc>, + local: Arc>, origin: Origin, signer: BoxedEcdsaSigner, keypair: Keypair, @@ -81,7 +81,7 @@ impl RemoteBridge { } /// Clone of the local provider. - pub fn local(&self) -> Arc> { + pub fn local(&self) -> Arc> { Arc::clone(&self.local) } } diff --git a/workspace/net/src/client/account/user_storage.rs b/workspace/net/src/client/account/user_storage.rs index dedcd33b5c..317b19171c 100644 --- a/workspace/net/src/client/account/user_storage.rs +++ b/workspace/net/src/client/account/user_storage.rs @@ -14,10 +14,12 @@ use sos_sdk::{ archive::{ AccountBackup, ExtractFilesLocation, Inventory, RestoreOptions, }, - search::{AccountSearch, DocumentCount, SearchIndex, AccountStatistics}, - Account, AccountBuilder, AccountData, AccountHandler, AccountInfo, - AuthenticatedUser, DelegatedPassphrase, DetachedView, - AccountsList, LocalProvider, NewAccount, AccessOptions, UserPaths, + search::{ + AccountSearch, AccountStatistics, DocumentCount, SearchIndex, + }, + AccessOptions, Account, AccountBuilder, AccountData, AccountHandler, + AccountInfo, AccountsList, AuthenticatedUser, DelegatedPassphrase, + DetachedView, FolderStorage, NewAccount, UserPaths, }, commit::{CommitHash, CommitProof, CommitState}, crypto::{AccessKey, SecureAccessKey}, @@ -83,7 +85,7 @@ impl SyncHandler { /// Try to sync the target folder against all remotes. async fn try_sync_folder( &self, - storage: Arc>, + storage: Arc>, folder: &Summary, commit_state: &CommitState, ) -> Result> { @@ -134,7 +136,7 @@ impl AccountHandler for SyncHandler { async fn before_change( &self, - storage: Arc>, + storage: Arc>, folder: &Summary, commit_state: &CommitState, ) -> Option { @@ -246,15 +248,14 @@ impl UserStorage { remotes: Arc::clone(&remotes), }; - let (account, new_account) = - LocalAccount::new_account_with_builder( - account_name, - passphrase.clone(), - builder, - data_dir.clone(), - Some(Box::new(handler)), - ) - .await?; + let (account, new_account) = LocalAccount::new_account_with_builder( + account_name, + passphrase.clone(), + builder, + data_dir.clone(), + Some(Box::new(handler)), + ) + .await?; let devices_dir = account.paths().devices_dir().clone(); @@ -286,7 +287,7 @@ impl UserStorage { } /// Storage provider. - pub fn storage(&self) -> Result>> { + pub fn storage(&self) -> Result>> { Ok(self.account.storage()?) } @@ -1206,7 +1207,7 @@ impl UserStorage { } /* -impl From for Arc> { +impl From for Arc> { fn from(value: UserStorage) -> Self { value.account.into() } diff --git a/workspace/net/src/server/services/events.rs b/workspace/net/src/server/services/events.rs index 8465823bcd..dfb372d33f 100644 --- a/workspace/net/src/server/services/events.rs +++ b/workspace/net/src/server/services/events.rs @@ -342,8 +342,7 @@ impl Service for EventLogService { } // Apply the change set of events to the log - let commits = - event_log.apply(changes).await?; + let commits = event_log.apply(changes).await?; // Get a new commit proof for the last leaf hash let proof = event_log.tree().head()?; diff --git a/workspace/sdk/src/account/account.rs b/workspace/sdk/src/account/account.rs index 9c24e73fc7..1ecb34fac4 100644 --- a/workspace/sdk/src/account/account.rs +++ b/workspace/sdk/src/account/account.rs @@ -16,10 +16,9 @@ use crate::{ AccountBackup, ExtractFilesLocation, Inventory, RestoreOptions, }, login::Login, - AccountBuilder, AccountInfo, AuthenticatedUser, - DelegatedPassphrase, AccountsList, LocalProvider, NewAccount, - UserPaths, - search::{DocumentCount, SearchIndex, AccountStatistics}, + search::{AccountStatistics, DocumentCount, SearchIndex}, + AccountBuilder, AccountInfo, AccountsList, AuthenticatedUser, + DelegatedPassphrase, FolderStorage, NewAccount, UserPaths, }, commit::{CommitHash, CommitProof, CommitState}, crypto::{AccessKey, SecureAccessKey}, @@ -64,7 +63,7 @@ pub trait AccountHandler { /// Called before changes to the account. async fn before_change( &self, - storage: Arc>, + storage: Arc>, folder: &Summary, commit_state: &CommitState, ) -> Option; @@ -131,7 +130,7 @@ struct Authenticated { user: AuthenticatedUser, /// Storage provider. - storage: Arc>, + storage: Arc>, /// Search index. index: AccountSearch, @@ -251,12 +250,11 @@ impl Account { let signer = new_account.user.signer().clone(); let address = signer.address()?; let mut storage = - LocalProvider::new(address.to_string(), data_dir.clone()).await?; + FolderStorage::new(address.to_string(), data_dir.clone()).await?; tracing::debug!("prepared storage provider"); - let events = - storage.import_new_account(&new_account).await?; + let events = storage.import_new_account(&new_account).await?; tracing::debug!("imported new account"); @@ -307,7 +305,7 @@ impl Account { } /// Storage provider. - pub fn storage(&self) -> Result>> { + pub fn storage(&self) -> Result>> { let auth = self.authenticated.as_ref().ok_or(Error::NotAuthenticated)?; Ok(Arc::clone(&auth.storage)) @@ -352,7 +350,7 @@ impl Account { // Signing key for the storage provider let signer = user.identity().signer().clone(); let storage = - LocalProvider::new(signer.address()?.to_string(), Some(data_dir)) + FolderStorage::new(signer.address()?.to_string(), Some(data_dir)) .await?; self.paths = storage.paths(); @@ -1813,7 +1811,7 @@ impl Account { } /* -impl From> for Arc> { +impl From> for Arc> { fn from(value: Account) -> Self { value.storage } diff --git a/workspace/sdk/src/account/archive/backup.rs b/workspace/sdk/src/account/archive/backup.rs index d09111056f..787f16e2d7 100644 --- a/workspace/sdk/src/account/archive/backup.rs +++ b/workspace/sdk/src/account/archive/backup.rs @@ -21,8 +21,8 @@ use crate::{ account::{ archive::{ArchiveItem, Inventory, Reader, Writer}, identity::Identity, - AccountInfo, DelegatedPassphrase, AccountsList, UserPaths, search::SearchIndex, + AccountInfo, AccountsList, DelegatedPassphrase, UserPaths, }, constants::{EVENT_LOG_EXT, VAULT_EXT}, crypto::AccessKey, diff --git a/workspace/sdk/src/account/builder.rs b/workspace/sdk/src/account/builder.rs index 0851775cd0..8c8f670406 100644 --- a/workspace/sdk/src/account/builder.rs +++ b/workspace/sdk/src/account/builder.rs @@ -46,7 +46,6 @@ pub struct NewAccount { } impl NewAccount { - /// Summary of the default folder. pub fn default_folder(&self) -> &Summary { self.default_folder.summary() diff --git a/workspace/sdk/src/account/contacts.rs b/workspace/sdk/src/account/contacts.rs index 434a2b4238..264143234a 100644 --- a/workspace/sdk/src/account/contacts.rs +++ b/workspace/sdk/src/account/contacts.rs @@ -1,6 +1,6 @@ //! Support for importing and exporting account contacts. use crate::{ - account::{Account, DelegatedPassphrase, AccountsList}, + account::{Account, AccountsList, DelegatedPassphrase}, events::{AuditData, AuditEvent, EventKind}, vault::{ secret::{Secret, SecretId, SecretMeta}, diff --git a/workspace/sdk/src/account/files/file_manager.rs b/workspace/sdk/src/account/files/file_manager.rs index a265ca2c8f..ca6c67422b 100644 --- a/workspace/sdk/src/account/files/file_manager.rs +++ b/workspace/sdk/src/account/files/file_manager.rs @@ -4,7 +4,7 @@ use crate::{ account::Account, account::{ - files::{EncryptedFile, FileStorage, FileStorageSync, basename}, + files::{basename, EncryptedFile, FileStorage, FileStorageSync}, DelegatedPassphrase, }, commit::{CommitHash, CommitProof}, @@ -126,7 +126,7 @@ impl Account { pub(crate) fn file_folder_location(&self, vault_id: &VaultId) -> PathBuf { self.paths.file_folder_location(vault_id.to_string()) } - + /// Decrypt a file and return the buffer. pub async fn download_file( &self, @@ -134,7 +134,8 @@ impl Account { secret_id: &SecretId, file_name: &str, ) -> Result> { - self.decrypt_file_storage(vault_id, secret_id, file_name).await + self.decrypt_file_storage(vault_id, secret_id, file_name) + .await } /// Expected location for a file by convention. diff --git a/workspace/sdk/src/account/files/mod.rs b/workspace/sdk/src/account/files/mod.rs index 6d187119c8..f8081f3525 100644 --- a/workspace/sdk/src/account/files/mod.rs +++ b/workspace/sdk/src/account/files/mod.rs @@ -1,6 +1,6 @@ //! File encryption/decryption and manager for external files. -use std::path::Path; use crate::Result; +use std::path::Path; mod external_files; mod external_files_sync; diff --git a/workspace/sdk/src/account/login.rs b/workspace/sdk/src/account/login.rs index 9b92670792..90103af2ad 100644 --- a/workspace/sdk/src/account/login.rs +++ b/workspace/sdk/src/account/login.rs @@ -9,8 +9,9 @@ use urn::Urn; use web3_address::ethereum::Address; use crate::{ - account::{AccountInfo, DelegatedPassphrase, AccountsList, UserPaths, - search::SearchIndex, + account::{ + search::SearchIndex, AccountInfo, AccountsList, DelegatedPassphrase, + UserPaths, }, constants::{DEVICE_KEY_URN, VAULT_EXT}, crypto::AccessKey, diff --git a/workspace/sdk/src/account/mod.rs b/workspace/sdk/src/account/mod.rs index 569165b609..e0042f67a9 100644 --- a/workspace/sdk/src/account/mod.rs +++ b/workspace/sdk/src/account/mod.rs @@ -17,7 +17,7 @@ pub mod search; pub mod security_report; pub use account::{ - Account, AccountData, AccountHandler, DetachedView, AccessOptions, + AccessOptions, Account, AccountData, AccountHandler, DetachedView, }; pub use builder::{AccountBuilder, NewAccount}; pub use identity::{AccountStatus, Identity}; @@ -25,8 +25,7 @@ pub use local::{AccountInfo, AccountRef, AccountsList}; pub use login::{AuthenticatedUser, DeviceSigner}; pub use passphrase::DelegatedPassphrase; pub use paths::UserPaths; -pub use provider::{LocalProvider, LocalState}; +pub use provider::{FolderStorage, LocalState}; use crate::Result; use std::path::Path; - diff --git a/workspace/sdk/src/account/provider.rs b/workspace/sdk/src/account/provider.rs index 7e523ba58b..b2b02eaf5b 100644 --- a/workspace/sdk/src/account/provider.rs +++ b/workspace/sdk/src/account/provider.rs @@ -1,9 +1,8 @@ //! Storage provider backed by the local filesystem. use crate::{ account::{ - archive::RestoreTargets, AccountStatus, NewAccount, - UserPaths, - search::SearchIndex, + archive::RestoreTargets, search::SearchIndex, AccountStatus, + NewAccount, UserPaths, }, commit::{CommitHash, CommitTree}, constants::VAULT_EXT, @@ -27,7 +26,7 @@ use std::{borrow::Cow, collections::HashMap, path::PathBuf, sync::Arc}; use tokio::sync::RwLock; /// Local storage provider. -pub struct LocalProvider { +pub struct FolderStorage { /// State of this storage. state: LocalState, @@ -38,7 +37,7 @@ pub struct LocalProvider { cache: HashMap, } -impl LocalProvider { +impl FolderStorage { /// Create a new local provider for an account with the given /// identifier. pub async fn new( @@ -56,7 +55,7 @@ impl LocalProvider { } /// Create new node cache backed by files on disc. - async fn new_paths(paths: Arc) -> Result { + async fn new_paths(paths: Arc) -> Result { if !vfs::metadata(paths.documents_dir()).await?.is_dir() { return Err(Error::NotDirectory( paths.documents_dir().to_path_buf(), diff --git a/workspace/sdk/src/account/search/mod.rs b/workspace/sdk/src/account/search/mod.rs index e1ce454767..d4e8c433b3 100644 --- a/workspace/sdk/src/account/search/mod.rs +++ b/workspace/sdk/src/account/search/mod.rs @@ -1,15 +1,18 @@ //! Account search index. -use std::{collections::{HashSet, HashMap}, sync::Arc}; -use tokio::sync::RwLock; -use serde::{Deserialize, Serialize}; use crate::{ crypto::AccessKey, vault::{ secret::{SecretId, SecretType}, - Gatekeeper, Vault, VaultId, Summary, + Gatekeeper, Summary, Vault, VaultId, }, vcard4, Result, }; +use serde::{Deserialize, Serialize}; +use std::{ + collections::{HashMap, HashSet}, + sync::Arc, +}; +use tokio::sync::RwLock; mod index; pub use index::*; diff --git a/workspace/sdk/src/events/log/file.rs b/workspace/sdk/src/events/log/file.rs index a6a64483a7..f20c22ffc7 100644 --- a/workspace/sdk/src/events/log/file.rs +++ b/workspace/sdk/src/events/log/file.rs @@ -204,10 +204,7 @@ impl EventLogFile { /// /// If any events fail this function will rollback the /// event log to it's previous state. - pub async fn apply( - &mut self, - events: Vec, - ) -> Result> { + pub async fn apply(&mut self, events: Vec) -> Result> { let mut buffer: Vec = Vec::new(); let mut commits = Vec::new(); let mut last_commit_hash = self.last_commit().await?; diff --git a/workspace/sdk/src/events/log/mod.rs b/workspace/sdk/src/events/log/mod.rs index 3c35168088..23bb1c1550 100644 --- a/workspace/sdk/src/events/log/mod.rs +++ b/workspace/sdk/src/events/log/mod.rs @@ -103,12 +103,10 @@ mod test { // Create a simple event log let mut server = EventLogFile::new(path).await?; server - .apply( - vec![ - WriteEvent::CreateVault(vault_buffer), - WriteEvent::CreateSecret(id, data), - ], - ) + .apply(vec![ + WriteEvent::CreateVault(vault_buffer), + WriteEvent::CreateSecret(id, data), + ]) .await?; Ok((server, id)) @@ -142,12 +140,10 @@ mod test { // Create a simple event log let mut server = EventLogFile::new(&server_file).await?; server - .apply( - vec![ - WriteEvent::CreateVault(vault_buffer), - WriteEvent::CreateSecret(id, data), - ], - ) + .apply(vec![ + WriteEvent::CreateVault(vault_buffer), + WriteEvent::CreateSecret(id, data), + ]) .await?; // Duplicate the server events on the client diff --git a/workspace/sdk/src/events/mod.rs b/workspace/sdk/src/events/mod.rs index 689784545d..972ce06e0f 100644 --- a/workspace/sdk/src/events/mod.rs +++ b/workspace/sdk/src/events/mod.rs @@ -29,7 +29,9 @@ pub struct Patch(pub Vec); impl Patch { /// Convert this patch into a collection of events. - pub async fn into_events(&self) -> Result> { + pub async fn into_events( + &self, + ) -> Result> { let mut events = Vec::new(); for record in &self.0 { let event = record.decode_event::().await?; diff --git a/workspace/sdk/src/lib.rs b/workspace/sdk/src/lib.rs index d6686912b5..bbe97d14ea 100644 --- a/workspace/sdk/src/lib.rs +++ b/workspace/sdk/src/lib.rs @@ -44,13 +44,13 @@ pub use pem; pub use secrecy; pub use sha2; pub use sha3; +pub use sos_vfs as vfs; pub use time; pub use totp_rs as totp; pub use url; pub use urn; pub use uuid; pub use vcard4; -pub use sos_vfs as vfs; pub use zxcvbn; /// Result type for the core library.