Update file deletion logic in upgrade accounts.

Author: tmpfs

crates/backend/src/audit.rs

@@ -46,6 +46,8 @@ pub async fn append_audit_events(events: &[AuditEvent]) -> Result<()> {
             provider.append_audit_events(events).await?;
         }
     }
+
+    // For test specs we don't require an audit trail
     #[cfg(debug_assertions)]
     {
         if let Some(providers) = providers() {

crates/core/src/paths.rs

@@ -330,14 +330,19 @@ impl Paths {
     /// account-level preferences.
     pub fn preferences_file(&self) -> PathBuf {
         let mut path = if self.is_global() {
-            self.documents_dir().join(PREFERENCES_FILE)
+            self.global_preferences_file()
         } else {
             self.user_dir().join(PREFERENCES_FILE)
         };
         path.set_extension(JSON_EXT);
         path
     }
 
+    /// Path to the global preferences file.
+    pub fn global_preferences_file(&self) -> PathBuf {
+        self.documents_dir().join(PREFERENCES_FILE)
+    }
+
     /// Path to the file used to store account-level system messages.
     ///
     /// # Panics

crates/database_upgrader/src/upgrader/mod.rs

@@ -435,6 +435,7 @@ async fn delete_stale_files(
     let mut files = vec![
         options.paths.identity_dir().to_owned(),
         options.paths.audit_file().to_owned(),
+        options.paths.global_preferences_file().to_owned(),
     ];
 
     for account in accounts {
@@ -461,5 +462,12 @@ async fn delete_stale_files(
         }
     }
 
+    // Can error if the local directory is not empty!
+    if let Err(error) = vfs::remove_dir(options.paths.local_dir()).await {
+        tracing::error!(
+            error = %error,
+            "updgrade_accounts::remove_local_dir");
+    }
+
     Ok(files)
 }