chore: rm blockchaintree dep from errors (#13730)

This commit is contained in:
Matthias Seitz
2025-01-08 14:40:18 +01:00
committed by GitHub
parent cb22b17b3e
commit 4d3cd2f248
4 changed files with 1 additions and 16 deletions

1
Cargo.lock generated
View File

@ -7271,7 +7271,6 @@ dependencies = [
name = "reth-errors" name = "reth-errors"
version = "1.1.5" version = "1.1.5"
dependencies = [ dependencies = [
"reth-blockchain-tree-api",
"reth-consensus", "reth-consensus",
"reth-execution-errors", "reth-execution-errors",
"reth-fs-util", "reth-fs-util",

View File

@ -11,7 +11,6 @@ repository.workspace = true
workspace = true workspace = true
[dependencies] [dependencies]
reth-blockchain-tree-api.workspace = true
reth-consensus.workspace = true reth-consensus.workspace = true
reth-execution-errors.workspace = true reth-execution-errors.workspace = true
reth-fs-util.workspace = true reth-fs-util.workspace = true

View File

@ -1,4 +1,3 @@
use reth_blockchain_tree_api::error::{BlockchainTreeError, CanonicalError};
use reth_consensus::ConsensusError; use reth_consensus::ConsensusError;
use reth_execution_errors::BlockExecutionError; use reth_execution_errors::BlockExecutionError;
use reth_fs_util::FsPathError; use reth_fs_util::FsPathError;
@ -31,10 +30,6 @@ pub enum RethError {
#[error(transparent)] #[error(transparent)]
Provider(#[from] ProviderError), Provider(#[from] ProviderError),
/// Canonical errors encountered.
#[error(transparent)]
Canonical(#[from] CanonicalError),
/// Any other error. /// Any other error.
#[error(transparent)] #[error(transparent)]
Other(Box<dyn core::error::Error + Send + Sync>), Other(Box<dyn core::error::Error + Send + Sync>),
@ -55,12 +50,6 @@ impl RethError {
} }
} }
impl From<BlockchainTreeError> for RethError {
fn from(error: BlockchainTreeError) -> Self {
Self::Canonical(CanonicalError::BlockchainTree(error))
}
}
impl From<FsPathError> for RethError { impl From<FsPathError> for RethError {
fn from(err: FsPathError) -> Self { fn from(err: FsPathError) -> Self {
Self::other(err) Self::other(err)
@ -78,10 +67,9 @@ mod size_asserts {
}; };
} }
static_assert_size!(RethError, 64); static_assert_size!(RethError, 56);
static_assert_size!(BlockExecutionError, 56); static_assert_size!(BlockExecutionError, 56);
static_assert_size!(ConsensusError, 48); static_assert_size!(ConsensusError, 48);
static_assert_size!(DatabaseError, 32); static_assert_size!(DatabaseError, 32);
static_assert_size!(ProviderError, 48); static_assert_size!(ProviderError, 48);
static_assert_size!(CanonicalError, 56);
} }

View File

@ -15,7 +15,6 @@
mod error; mod error;
pub use error::{RethError, RethResult}; pub use error::{RethError, RethResult};
pub use reth_blockchain_tree_api::error::{BlockchainTreeError, CanonicalError};
pub use reth_consensus::ConsensusError; pub use reth_consensus::ConsensusError;
pub use reth_execution_errors::{BlockExecutionError, BlockValidationError}; pub use reth_execution_errors::{BlockExecutionError, BlockValidationError};
pub use reth_storage_errors::{ pub use reth_storage_errors::{