feat: remove from fspath conversion for storagelockerr (#14291)

crates/storage/db/src/lockfile.rs

@@ -86,7 +86,7 @@ impl StorageLockInner {
     fn new(file_path: PathBuf) -> Result<Self, StorageLockError> {
         // Create the directory if it doesn't exist
         if let Some(parent) = file_path.parent() {
-            reth_fs_util::create_dir_all(parent)?;
+            reth_fs_util::create_dir_all(parent).map_err(StorageLockError::other)?;
         }
 
         // Write this process unique identifier (pid & start_time) to file
@@ -148,7 +148,8 @@ impl ProcessUID {
 
     /// Writes `pid` and `start_time` to a file.
     fn write(&self, path: &Path) -> Result<(), StorageLockError> {
-        Ok(reth_fs_util::write(path, format!("{}\n{}", self.pid, self.start_time))?)
+        reth_fs_util::write(path, format!("{}\n{}", self.pid, self.start_time))
+            .map_err(StorageLockError::other)
     }
 }
 

crates/storage/errors/Cargo.toml

@@ -12,7 +12,6 @@ workspace = true
 
 [dependencies]
 # reth
-reth-fs-util.workspace = true
 reth-primitives-traits.workspace = true
 reth-prune-types.workspace = true
 reth-static-file-types.workspace = true

crates/storage/errors/src/lockfile.rs

@@ -1,5 +1,4 @@
 use alloc::string::{String, ToString};
-use reth_fs_util::FsPathError;
 
 /// Storage lock error.
 #[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
@@ -12,9 +11,9 @@ pub enum StorageLockError {
     Other(String),
 }
 
-/// TODO: turn into variant once `ProviderError`
-impl From<FsPathError> for StorageLockError {
-    fn from(error: FsPathError) -> Self {
-        Self::Other(error.to_string())
+impl StorageLockError {
+    /// Converts any error into the `Other` variant of `StorageLockError`.
+    pub fn other<E: core::error::Error>(err: E) -> Self {
+        Self::Other(err.to_string())
     }
 }