refactor(storage): Add "proper" error for remove_device_data

Author: FirelightFlagboy

libparsec/crates/client/src/device/mod.rs

@@ -1,7 +1,7 @@
 // Parsec Cloud (https://parsec.cloud) Copyright (c) BUSL-1.1 2016-present Scille SAS
 
 use libparsec_platform_device_loader::AvailableDevice;
-use libparsec_types::prelude::*;
+use libparsec_platform_storage::RemoveDeviceDataError;
 
 use crate::ClientConfig;
 
@@ -10,7 +10,7 @@ pub enum RemoveDeviceError {
     #[error("Failed to remove device: {}", .0)]
     DeviceRemovalError(libparsec_platform_device_loader::RemoveDeviceError),
     #[error("Failed to remove device data: {}", .0)]
-    DeviceDataRemovalError(anyhow::Error),
+    DeviceDataRemovalError(RemoveDeviceDataError),
 }
 
 /// Remove device from existence.

libparsec/crates/platform_storage/src/lib.rs

@@ -13,6 +13,13 @@ pub(crate) use web as platform;
 pub mod certificates;
 pub mod user;
 pub mod workspace;
+
+#[derive(Debug, thiserror::Error)]
+pub enum RemoveDeviceDataError {
+    #[error("Failed to remove data: {0}")]
+    FailedToRemoveData(#[from] libparsec_types::anyhow::Error),
+}
+
 pub use platform::cleanup::remove_device_data;
 
 // Testbed integration is tested in the `libparsec_tests_fixture` crate.

libparsec/crates/platform_storage/src/native/cleanup.rs

@@ -4,13 +4,17 @@ use std::path::Path;
 
 use libparsec_types::{anyhow, DeviceID};
 
-pub async fn remove_device_data(data_base_dir: &Path, device_id: DeviceID) -> anyhow::Result<()> {
+pub async fn remove_device_data(
+    data_base_dir: &Path,
+    device_id: DeviceID,
+) -> Result<(), crate::RemoveDeviceDataError> {
     let path = data_base_dir.join(device_id.hex());
     log::debug!("Removing device data at {}", path.display());
 
     tokio::fs::remove_dir_all(&path)
         .await
         .map_err(anyhow::Error::from)
+        .map_err(Into::into)
 }
 
 #[cfg(test)]

libparsec/crates/platform_storage/src/web/cleanup.rs

@@ -14,7 +14,10 @@ async fn drop_db(name: &str) -> anyhow::Result<()> {
         .map_err(anyhow::Error::from)
 }
 
-pub async fn remove_device_data(data_base_dir: &Path, device_id: DeviceID) -> anyhow::Result<()> {
+pub async fn remove_device_data(
+    data_base_dir: &Path,
+    device_id: DeviceID,
+) -> Result<(), crate::RemoveDeviceDataError> {
     drop_db(&get_certificates_storage_db_name(data_base_dir, device_id)).await?;
     drop_db(&get_user_storage_db_name(data_base_dir, device_id)).await?;