chore: flatten reth-primitives dep (#13082)

paradigmxyz · Dec 2, 2024 · 9831953 · 9831953
1 parent 039f121
commit 9831953
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/storage/errors/Cargo.toml b/crates/storage/errors/Cargo.toml
@@ -12,8 +12,9 @@ workspace = true
 
 [dependencies]
 # reth
-reth-primitives.workspace = true
+reth-primitives-traits.workspace = true
 reth-fs-util.workspace = true
+reth-static-file-types.workspace = true
 
 # ethereum
 alloy-eips.workspace = true
@@ -26,9 +27,9 @@ derive_more.workspace = true
 [features]
 default = ["std"]
 std = [
-	"reth-primitives/std",
 	"alloy-eips/std",
 	"alloy-primitives/std",
 	"alloy-rlp/std",
-	"derive_more/std"
+	"derive_more/std",
+	"reth-primitives-traits/std"
 ]
diff --git a/crates/storage/errors/src/provider.rs b/crates/storage/errors/src/provider.rs
@@ -3,7 +3,8 @@ use alloc::{boxed::Box, string::String};
 use alloy_eips::{BlockHashOrNumber, HashOrNumber};
 use alloy_primitives::{Address, BlockHash, BlockNumber, TxNumber, B256};
 use derive_more::Display;
-use reth_primitives::{GotExpected, StaticFileSegment};
+use reth_primitives_traits::GotExpected;
+use reth_static_file_types::StaticFileSegment;
 
 /// Provider result type.
 pub type ProviderResult<Ok> = Result<Ok, ProviderError>;
@@ -165,7 +166,6 @@ impl core::error::Error for ProviderError {
     fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
         match self {
             Self::Database(source) => core::error::Error::source(source),
-            Self::Rlp(source) => core::error::Error::source(source),
             Self::StorageLockError(source) => core::error::Error::source(source),
             Self::UnifiedStorageWriterError(source) => core::error::Error::source(source),
             _ => Option::None,

diff --git a/crates/storage/errors/src/writer.rs b/crates/storage/errors/src/writer.rs
@@ -1,5 +1,5 @@
 use crate::db::DatabaseError;
-use reth_primitives::StaticFileSegment;
+use reth_static_file_types::StaticFileSegment;
 
 /// `UnifiedStorageWriter` related errors
 /// `StorageWriter` related errors