jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

use core::error::Error (#11317)

Browse Source
This commit is contained in:
Thomas Coratger
2024-09-29 18:47:48 +02:00
committed by GitHub
parent b8aeecae62
commit 55bf29e6d2
25 changed files with 90 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
crates/evm/execution-errors/src/lib.rs
View File

@ -125,12 +125,11 @@ impl From<StateRootError> for BlockValidationError {
}
}
#[cfg(feature = "std")]
impl std::error::Error for BlockValidationError {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
impl core::error::Error for BlockValidationError {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::EVM { error, .. } => std::error::Error::source(error),
Self::StateRoot(source) => std::error::Error::source(source),
Self::EVM { error, .. } => core::error::Error::source(error),
Self::StateRoot(source) => core::error::Error::source(source),
_ => Option::None,
}
}
@ -153,7 +152,7 @@ impl BlockExecutionError {
#[cfg(feature = "std")]
pub fn other<E>(error: E) -> Self
where
E: std::error::Error + Send + Sync + 'static,
E: core::error::Error + Send + Sync + 'static,
{
Self::Internal(InternalBlockExecutionError::other(error))
}
@ -185,13 +184,12 @@ impl From<ProviderError> for BlockExecutionError {
}
}
#[cfg(feature = "std")]
impl std::error::Error for BlockExecutionError {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
impl core::error::Error for BlockExecutionError {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::Validation(source) => std::error::Error::source(source),
Self::Consensus(source) => std::error::Error::source(source),
Self::Internal(source) => std::error::Error::source(source),
Self::Validation(source) => core::error::Error::source(source),
Self::Consensus(source) => core::error::Error::source(source),
Self::Internal(source) => core::error::Error::source(source),
}
}
}
@ -216,8 +214,7 @@ pub enum InternalBlockExecutionError {
#[from]
LatestBlock(ProviderError),
/// Arbitrary Block Executor Errors
#[cfg(feature = "std")]
Other(Box<dyn std::error::Error + Send + Sync>),
Other(Box<dyn core::error::Error + Send + Sync>),
}
impl InternalBlockExecutionError {
@ -225,7 +222,7 @@ impl InternalBlockExecutionError {
#[cfg(feature = "std")]
pub fn other<E>(error: E) -> Self
where
E: std::error::Error + Send + Sync + 'static,
E: core::error::Error + Send + Sync + 'static,
{
Self::Other(Box::new(error))
}
@ -237,12 +234,11 @@ impl InternalBlockExecutionError {
}
}
#[cfg(feature = "std")]
impl std::error::Error for InternalBlockExecutionError {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
impl core::error::Error for InternalBlockExecutionError {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::Pruning(source) => std::error::Error::source(source),
Self::LatestBlock(source) => std::error::Error::source(source),
Self::Pruning(source) => core::error::Error::source(source),
Self::LatestBlock(source) => core::error::Error::source(source),
_ => Option::None,
}
}

34
crates/evm/execution-errors/src/trie.rs
View File

@ -15,12 +15,11 @@ pub enum StateRootError {
StorageRootError(StorageRootError),
}
#[cfg(feature = "std")]
impl std::error::Error for StateRootError {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
impl core::error::Error for StateRootError {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::Database(source) => std::error::Error::source(source),
Self::StorageRootError(source) => std::error::Error::source(source),
Self::Database(source) => core::error::Error::source(source),
Self::StorageRootError(source) => core::error::Error::source(source),
}
}
}
@ -49,11 +48,10 @@ impl From<StorageRootError> for DatabaseError {
}
}
#[cfg(feature = "std")]
impl std::error::Error for StorageRootError {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
impl core::error::Error for StorageRootError {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::Database(source) => std::error::Error::source(source),
Self::Database(source) => core::error::Error::source(source),
}
}
}
@ -76,12 +74,11 @@ impl From<StateProofError> for ProviderError {
}
}
#[cfg(feature = "std")]
impl std::error::Error for StateProofError {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
impl core::error::Error for StateProofError {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::Database(source) => std::error::Error::source(source),
Self::Rlp(source) => std::error::Error::source(source),
Self::Database(source) => core::error::Error::source(source),
Self::Rlp(source) => core::error::Error::source(source),
}
}
}
@ -112,12 +109,11 @@ impl From<TrieWitnessError> for ProviderError {
}
}
#[cfg(feature = "std")]
impl std::error::Error for TrieWitnessError {
fn source(&self) -> Option<&(dyn std::error::Error + 'static)> {
impl core::error::Error for TrieWitnessError {
fn source(&self) -> Option<&(dyn core::error::Error + 'static)> {
match self {
Self::Proof(source) => std::error::Error::source(source),
Self::Rlp(source) => std::error::Error::source(source),
Self::Proof(source) => core::error::Error::source(source),
Self::Rlp(source) => core::error::Error::source(source),
_ => Option::None,
}
}