From e60bd73e32ae716b1a3d84118af177e423521aaf Mon Sep 17 00:00:00 2001
From: brooks <brooks@solana.com>
Date: Tue, 23 Jan 2024 11:10:14 -0500
Subject: [PATCH 1/5] Replaces fs-err in streaming_snapshot_dir_files()

---
 runtime/src/snapshot_utils.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
index 76a2d8cf60793a..189eaca98931de 100644
--- a/runtime/src/snapshot_utils.rs
+++ b/runtime/src/snapshot_utils.rs
@@ -1498,7 +1498,7 @@ fn streaming_snapshot_dir_files(
     file_sender.send(snapshot_version_path.into())?;
 
     for account_path in account_paths {
-        for file in fs_err::read_dir(account_path)? {
+        for file in fs::read_dir(account_path)? {
             file_sender.send(file?.path())?;
         }
     }

From 13ac877a4c39a8f58b69f03ff0032f639b73f0b9 Mon Sep 17 00:00:00 2001
From: brooks <brooks@solana.com>
Date: Tue, 23 Jan 2024 11:11:20 -0500
Subject: [PATCH 2/5] Replaces fs-err in serialize_snapshot_data_file_capped()

---
 runtime/src/snapshot_utils.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
index 189eaca98931de..606b39d3792f94 100644
--- a/runtime/src/snapshot_utils.rs
+++ b/runtime/src/snapshot_utils.rs
@@ -1046,7 +1046,7 @@ fn serialize_snapshot_data_file_capped<F>(
 where
     F: FnOnce(&mut BufWriter<std::fs::File>) -> Result<()>,
 {
-    let data_file = fs_err::File::create(data_file_path)?.into();
+    let data_file = fs::File::create(data_file_path)?;
     let mut data_file_stream = BufWriter::new(data_file);
     serializer(&mut data_file_stream)?;
     data_file_stream.flush()?;

From c84ad61d012a5528132909cd5ae11d1184d5dfe3 Mon Sep 17 00:00:00 2001
From: brooks <brooks@solana.com>
Date: Tue, 23 Jan 2024 11:13:13 -0500
Subject: [PATCH 3/5] Replaces fs-err in
 create_snapshot_meta_files_for_unarchived_snapshot()

---
 runtime/src/snapshot_utils.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
index 606b39d3792f94..de5ab8b17a902e 100644
--- a/runtime/src/snapshot_utils.rs
+++ b/runtime/src/snapshot_utils.rs
@@ -1413,16 +1413,16 @@ fn create_snapshot_meta_files_for_unarchived_snapshot(unpack_dir: impl AsRef<Pat
         .path();
 
     let version_file = unpack_dir.as_ref().join(SNAPSHOT_VERSION_FILENAME);
-    fs_err::hard_link(version_file, slot_dir.join(SNAPSHOT_VERSION_FILENAME))?;
+    fs::hard_link(version_file, slot_dir.join(SNAPSHOT_VERSION_FILENAME))?;
 
     let status_cache_file = snapshots_dir.join(SNAPSHOT_STATUS_CACHE_FILENAME);
-    fs_err::hard_link(
+    fs::hard_link(
         status_cache_file,
         slot_dir.join(SNAPSHOT_STATUS_CACHE_FILENAME),
     )?;
 
     let state_complete_file = slot_dir.join(SNAPSHOT_STATE_COMPLETE_FILENAME);
-    fs_err::File::create(state_complete_file)?;
+    fs::File::create(state_complete_file)?;
 
     Ok(())
 }

From e4ebc2b000e906916e3e0269c85a135766541ca0 Mon Sep 17 00:00:00 2001
From: brooks <brooks@solana.com>
Date: Tue, 23 Jan 2024 11:16:18 -0500
Subject: [PATCH 4/5] Replaces fs-err in create_snapshot_data_file_stream()

---
 runtime/src/snapshot_utils.rs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
index de5ab8b17a902e..f5d41c08c9adb2 100644
--- a/runtime/src/snapshot_utils.rs
+++ b/runtime/src/snapshot_utils.rs
@@ -1117,7 +1117,7 @@ fn create_snapshot_data_file_stream(
     snapshot_root_file_path: impl AsRef<Path>,
     maximum_file_size: u64,
 ) -> Result<(u64, BufReader<std::fs::File>)> {
-    let snapshot_file_size = fs_err::metadata(&snapshot_root_file_path)?.len();
+    let snapshot_file_size = fs::metadata(&snapshot_root_file_path)?.len();
 
     if snapshot_file_size > maximum_file_size {
         let error_message = format!(
@@ -1129,8 +1129,8 @@ fn create_snapshot_data_file_stream(
         return Err(IoError::other(error_message).into());
     }
 
-    let snapshot_data_file = fs_err::File::open(snapshot_root_file_path.as_ref())?;
-    let snapshot_data_file_stream = BufReader::new(snapshot_data_file.into());
+    let snapshot_data_file = fs::File::open(snapshot_root_file_path)?;
+    let snapshot_data_file_stream = BufReader::new(snapshot_data_file);
 
     Ok((snapshot_file_size, snapshot_data_file_stream))
 }

From 2b553f553406acef207e0ed6a6247ff93178bb83 Mon Sep 17 00:00:00 2001
From: brooks <brooks@solana.com>
Date: Tue, 23 Jan 2024 11:17:14 -0500
Subject: [PATCH 5/5] Removes fs-err import

---
 runtime/src/snapshot_utils.rs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/src/snapshot_utils.rs b/runtime/src/snapshot_utils.rs
index f5d41c08c9adb2..239f71d546aa98 100644
--- a/runtime/src/snapshot_utils.rs
+++ b/runtime/src/snapshot_utils.rs
@@ -13,7 +13,6 @@ use {
     bzip2::bufread::BzDecoder,
     crossbeam_channel::Sender,
     flate2::read::GzDecoder,
-    fs_err,
     lazy_static::lazy_static,
     log::*,
     regex::Regex,