Rename type.

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<Option<AccountInfo>> {
     let account_ref = AccountRef::Address(inventory.manifest.address);
     let account = find_account(&account_ref).await?;
 
-    let provider: Option<Arc<RwLock<LocalProvider>>> =
+    let provider: Option<Arc<RwLock<FolderStorage>>> =
         if let Some(account) = account {
             let confirmed = read_flag(Some(
                 "Overwrite all account data from backup? (y/n) ",

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::{

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},

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()),
     )

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()

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?;
 

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<RemoteBridge> {
     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<PathBuf>,
 ) -> 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<Vec<(SecretId, &'static str)>> {
     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<PathBuf>,
-) -> 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 {

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;

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;

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;

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;

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;

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;

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<RwLock<LocalProvider>>,
+    local: Arc<RwLock<FolderStorage>>,
     /// 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<RwLock<LocalProvider>>,
+        local: Arc<RwLock<FolderStorage>>,
         origin: Origin,
         signer: BoxedEcdsaSigner,
         keypair: Keypair,
@@ -81,7 +81,7 @@ impl RemoteBridge {
     }
 
     /// Clone of the local provider.
-    pub fn local(&self) -> Arc<RwLock<LocalProvider>> {
+    pub fn local(&self) -> Arc<RwLock<FolderStorage>> {
         Arc::clone(&self.local)
     }
 }

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<RwLock<LocalProvider>>,
+        storage: Arc<RwLock<FolderStorage>>,
         folder: &Summary,
         commit_state: &CommitState,
     ) -> Result<Option<CommitState>> {
@@ -134,7 +136,7 @@ impl AccountHandler for SyncHandler {
 
     async fn before_change(
         &self,
-        storage: Arc<RwLock<LocalProvider>>,
+        storage: Arc<RwLock<FolderStorage>>,
         folder: &Summary,
         commit_state: &CommitState,
     ) -> Option<CommitState> {
@@ -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<Arc<RwLock<LocalProvider>>> {
+    pub fn storage(&self) -> Result<Arc<RwLock<FolderStorage>>> {
         Ok(self.account.storage()?)
     }
 
@@ -1206,7 +1207,7 @@ impl UserStorage {
 }
 
 /*
-impl From<UserStorage> for Arc<RwLock<LocalProvider>> {
+impl From<UserStorage> for Arc<RwLock<FolderStorage>> {
     fn from(value: UserStorage) -> Self {
         value.account.into()
     }