Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: replace std::fs usages with reth-primitives #5813

Merged
merged 1 commit into from
Dec 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/reth/src/debug_cmd/build_block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ impl Command {
let mut blobs_bundle = self
.blobs_bundle_path
.map(|path| -> eyre::Result<BlobsBundleV1> {
let contents = std::fs::read_to_string(&path)
let contents = fs::read_to_string(&path)
.wrap_err(format!("could not read {}", path.display()))?;
serde_json::from_str(&contents).wrap_err("failed to deserialize blobs bundle")
})
Expand Down
5 changes: 3 additions & 2 deletions bin/reth/src/node/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ use reth_network::{NetworkBuilder, NetworkConfig, NetworkEvents, NetworkHandle,
use reth_network_api::{NetworkInfo, PeersInfo};
use reth_primitives::{
constants::eip4844::{LoadKzgSettingsError, MAINNET_KZG_TRUSTED_SETUP},
fs,
kzg::KzgSettings,
stage::StageId,
BlockHashOrNumber, BlockNumber, ChainSpec, DisplayHardforks, Head, SealedHeader, B256,
Expand Down Expand Up @@ -1056,8 +1057,8 @@ async fn run_network_until_shutdown<C>(
let known_peers = network.all_peers().collect::<Vec<_>>();
if let Ok(known_peers) = serde_json::to_string_pretty(&known_peers) {
trace!(target: "reth::cli", peers_file =?file_path, num_peers=%known_peers.len(), "Saving current peers");
let parent_dir = file_path.parent().map(std::fs::create_dir_all).transpose();
match parent_dir.and_then(|_| std::fs::write(&file_path, known_peers)) {
let parent_dir = file_path.parent().map(fs::create_dir_all).transpose();
match parent_dir.and_then(|_| fs::write(&file_path, known_peers)) {
Ok(_) => {
info!(target: "reth::cli", peers_file=?file_path, "Wrote network peers to file");
}
Expand Down
4 changes: 2 additions & 2 deletions crates/stages/benches/setup/account_hashing.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use super::{constants, StageRange};
use reth_db::{
cursor::DbCursorRO, database::Database, tables, transaction::DbTx, DatabaseError as DbError,
};
use reth_primitives::stage::StageCheckpoint;
use reth_primitives::{fs, stage::StageCheckpoint};
use reth_stages::{
stages::{AccountHashingStage, SeedOpts},
test_utils::TestStageDB,
Expand Down Expand Up @@ -61,7 +61,7 @@ fn generate_testdata_db(num_blocks: u64) -> (PathBuf, StageRange) {

if !path.exists() {
// create the dirs
std::fs::create_dir_all(&path).unwrap();
fs::create_dir_all(&path).unwrap();
println!("Account Hashing testdata not found, generating to {:?}", path.display());
let db = TestStageDB::new(&path);
let provider = db.factory.provider_rw().unwrap();
Expand Down
4 changes: 2 additions & 2 deletions crates/stages/benches/setup/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ use reth_interfaces::test_utils::{
random_eoa_account_range,
},
};
use reth_primitives::{Account, Address, SealedBlock, B256, U256};
use reth_primitives::{fs, Account, Address, SealedBlock, B256, U256};
use reth_stages::{
stages::{AccountHashingStage, StorageHashingStage},
test_utils::TestStageDB,
Expand Down Expand Up @@ -102,7 +102,7 @@ pub(crate) fn txs_testdata(num_blocks: u64) -> PathBuf {

if !path.exists() {
// create the dirs
std::fs::create_dir_all(&path).unwrap();
fs::create_dir_all(&path).unwrap();
println!("Transactions testdata not found, generating to {:?}", path.display());
let db = TestStageDB::new(&path);

Expand Down
9 changes: 5 additions & 4 deletions crates/storage/db/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ pub mod test_utils {
database::Database,
database_metrics::{DatabaseMetadata, DatabaseMetadataValue, DatabaseMetrics},
};
use reth_primitives::fs;
use std::{path::PathBuf, sync::Arc};

/// Error during database open
Expand All @@ -179,7 +180,7 @@ pub mod test_utils {
fn drop(&mut self) {
if let Some(db) = self.db.take() {
drop(db);
let _ = std::fs::remove_dir_all(&self.path);
let _ = fs::remove_dir_all(&self.path);
}
}
}
Expand Down Expand Up @@ -260,6 +261,7 @@ mod tests {
version::{db_version_file_path, DatabaseVersionError},
};
use assert_matches::assert_matches;
use reth_primitives::fs;
use tempfile::tempdir;

#[test]
Expand All @@ -280,8 +282,7 @@ mod tests {

// Database is not empty, version file is malformed
{
std::fs::write(path.path().join(db_version_file_path(&path)), "invalid-version")
.unwrap();
fs::write(path.path().join(db_version_file_path(&path)), "invalid-version").unwrap();
let db = init_db(&path, None);
assert!(db.is_err());
assert_matches!(
Expand All @@ -292,7 +293,7 @@ mod tests {

// Database is not empty, version file contains not matching version
{
std::fs::write(path.path().join(db_version_file_path(&path)), "0").unwrap();
fs::write(path.path().join(db_version_file_path(&path)), "0").unwrap();
let db = init_db(&path, None);
assert!(db.is_err());
assert_matches!(
Expand Down