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

chore: rm ToRpcError usage from engine crate (#11311)

Browse Source
This commit is contained in:
Matthias Seitz
2024-09-28 18:06:17 +02:00
committed by GitHub
parent 6828bbacc9
commit 65f7e883e7
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/rpc/rpc-engine-api/Cargo.toml
View File

@ -16,7 +16,6 @@ workspace = true
reth-chainspec.workspace = true
reth-primitives.workspace = true
reth-rpc-api.workspace = true
reth-rpc-types.workspace = true
reth-storage-api.workspace = true
reth-beacon-consensus.workspace = true
reth-payload-builder.workspace = true

11
crates/rpc/rpc-engine-api/src/error.rs
View File

@ -4,7 +4,6 @@ use jsonrpsee_types::error::{
};
use reth_beacon_consensus::{BeaconForkChoiceUpdateError, BeaconOnNewPayloadError};
use reth_payload_primitives::{EngineObjectValidationError, PayloadBuilderError};
use reth_rpc_types::ToRpcError;
use thiserror::Error;
/// The Engine API result type
@ -92,15 +91,15 @@ pub enum EngineApiError {
/// The payload or attributes are known to be malformed before processing.
#[error(transparent)]
EngineObjectValidationError(#[from] EngineObjectValidationError),
/// Any other error
/// Any other rpc error
#[error("{0}")]
Other(Box<dyn ToRpcError>),
Other(jsonrpsee_types::ErrorObject<'static>),
}
impl EngineApiError {
/// Crates a new [`EngineApiError::Other`] variant.
pub fn other<E: ToRpcError>(err: E) -> Self {
Self::Other(Box::new(err))
pub const fn other(err: jsonrpsee_types::ErrorObject<'static>) -> Self {
Self::Other(err)
}
}
@ -187,7 +186,7 @@ impl From<EngineApiError> for jsonrpsee_types::error::ErrorObject<'static> {
SERVER_ERROR_MSG,
Some(ErrorData::new(error)),
),
EngineApiError::Other(err) => err.to_rpc_error(),
EngineApiError::Other(err) => err,
}
}
}