diff --git a/crates/storage/db/benches/criterion.rs b/crates/storage/db/benches/criterion.rs index 0c100d72d..6d273a8ce 100644 --- a/crates/storage/db/benches/criterion.rs +++ b/crates/storage/db/benches/criterion.rs @@ -1,14 +1,22 @@ #![allow(missing_docs)] + +use std::{path::Path, sync::Arc}; + use criterion::{ black_box, criterion_group, criterion_main, measurement::WallTime, BenchmarkGroup, Criterion, }; use pprof::criterion::{Output, PProfProfiler}; -use reth_db::tables::*; +use reth_db::{tables::*, test_utils::create_test_rw_db_with_path}; use reth_db_api::{ cursor::{DbCursorRO, DbCursorRW, DbDupCursorRO, DbDupCursorRW}, - table::{Decode, Decompress, DupSort}, - transaction::DbTx, + database::Database, + table::{Compress, Decode, Decompress, DupSort, Encode, Table}, + transaction::{DbTx, DbTxMut}, }; +use reth_fs_util as fs; + +mod utils; +use utils::*; criterion_group! { name = benches; @@ -291,5 +299,3 @@ where // group.bench_function(format!("{}.RandomRead", T::NAME), |b| {}); } - -include!("./utils.rs"); diff --git a/crates/storage/db/benches/hash_keys.rs b/crates/storage/db/benches/hash_keys.rs index 1807e6f4a..89073dea6 100644 --- a/crates/storage/db/benches/hash_keys.rs +++ b/crates/storage/db/benches/hash_keys.rs @@ -1,4 +1,7 @@ #![allow(missing_docs)] + +use std::{collections::HashSet, path::Path, sync::Arc}; + use criterion::{ black_box, criterion_group, criterion_main, measurement::WallTime, BenchmarkGroup, Criterion, }; @@ -9,9 +12,17 @@ use proptest::{ strategy::{Strategy, ValueTree}, test_runner::TestRunner, }; -use reth_db::TransactionHashNumbers; -use reth_db_api::cursor::DbCursorRW; -use std::collections::HashSet; +use reth_db::{test_utils::create_test_rw_db_with_path, DatabaseEnv, TransactionHashNumbers}; +use reth_db_api::{ + cursor::DbCursorRW, + database::Database, + table::{Table, TableRow}, + transaction::DbTxMut, +}; +use reth_fs_util as fs; + +mod utils; +use utils::*; criterion_group! { name = benches; @@ -252,5 +263,3 @@ where }) .unwrap(); } - -include!("./utils.rs"); diff --git a/crates/storage/db/benches/utils.rs b/crates/storage/db/benches/utils.rs index 97154d483..72d121aa7 100644 --- a/crates/storage/db/benches/utils.rs +++ b/crates/storage/db/benches/utils.rs @@ -1,20 +1,24 @@ +#![cfg(feature = "test-utils")] +#![allow(missing_docs)] + +use std::{path::Path, sync::Arc}; + use alloy_primitives::Bytes; use reth_db::{test_utils::create_test_rw_db_with_path, DatabaseEnv}; use reth_db_api::{ - database::Database, table::{Compress, Encode, Table, TableRow}, transaction::DbTxMut, + Database, }; use reth_fs_util as fs; -use std::{path::Path, sync::Arc}; /// Path where the DB is initialized for benchmarks. #[allow(dead_code)] -const BENCH_DB_PATH: &str = "/tmp/reth-benches"; +pub(crate) const BENCH_DB_PATH: &str = "/tmp/reth-benches"; /// Used for `RandomRead` and `RandomWrite` benchmarks. #[allow(dead_code)] -const RANDOM_INDEXES: [usize; 10] = [23, 2, 42, 5, 3, 99, 54, 0, 33, 64]; +pub(crate) const RANDOM_INDEXES: [usize; 10] = [23, 2, 42, 5, 3, 99, 54, 0, 33, 64]; /// Returns bench vectors in the format: `Vec<(Key, EncodedKey, Value, CompressedValue)>`. #[allow(dead_code)]