github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-29 09:08:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

feat(rpc): add impl_to_rpc_result macro (#986)

Browse Source
This commit is contained in:
Matthias Seitz
2023-01-23 15:27:21 +01:00
committed by GitHub
parent c7289bd9e8
commit 9bc9cdbbee
1 changed files with 58 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

164
crates/net/rpc/src/result.rs
View File

@@ -1,7 +1,6 @@
//! Additional helpers for converting errors.
use jsonrpsee::core::{Error as RpcError, RpcResult};
use reth_network_api::NetworkError;
/// Helper trait to easily convert various `Result` types into [`RpcResult`]
pub(crate) trait ToRpcResult<Ok, Err> {
@@ -31,115 +30,68 @@ pub(crate) trait ToRpcResult<Ok, Err> {
fn with_message(self, msg: &str) -> RpcResult<Ok>;
}
impl<Ok> ToRpcResult<Ok, reth_interfaces::Error> for reth_interfaces::Result<Ok> {
#[inline]
fn map_rpc_err<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce(reth_interfaces::Error) -> (i32, M, Option<&'a [u8]>),
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => {
let (code, msg, data) = op(err);
Err(rpc_err(code, msg, data))
/// A macro that implements the `ToRpcResult` for a specific error type
macro_rules! impl_to_rpc_result {
($err:ty) => {
impl<Ok> ToRpcResult<Ok, $err> for Result<Ok, $err> {
#[inline]
fn map_rpc_err<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce($err) -> (i32, M, Option<&'a [u8]>),
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => {
let (code, msg, data) = op(err);
Err(rpc_err(code, msg, data))
}
}
}
#[inline]
fn map_internal_err<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce($err) -> M,
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => Err(internal_rpc_err(op(err))),
}
}
#[inline]
fn map_internal_err_with_data<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce($err) -> (M, &'a [u8]),
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => {
let (msg, data) = op(err);
Err(internal_rpc_err_with_data(msg, data))
}
}
}
#[inline]
fn with_message(self, msg: &str) -> RpcResult<Ok> {
match self {
Ok(t) => Ok(t),
Err(err) => {
let msg = format!("{msg}: {err:?}");
Err(internal_rpc_err(msg))
}
}
}
}
}
#[inline]
fn map_internal_err<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce(reth_interfaces::Error) -> M,
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => Err(internal_rpc_err(op(err))),
}
}
#[inline]
fn map_internal_err_with_data<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce(reth_interfaces::Error) -> (M, &'a [u8]),
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => {
let (msg, data) = op(err);
Err(internal_rpc_err_with_data(msg, data))
}
}
}
#[inline]
fn with_message(self, msg: &str) -> RpcResult<Ok> {
match self {
Ok(t) => Ok(t),
Err(err) => {
let msg = format!("{msg}: {err:?}");
Err(internal_rpc_err(msg))
}
}
}
};
}
impl<Ok> ToRpcResult<Ok, NetworkError> for Result<Ok, NetworkError> {
#[inline]
fn map_rpc_err<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce(NetworkError) -> (i32, M, Option<&'a [u8]>),
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => {
let (code, msg, data) = op(err);
Err(rpc_err(code, msg, data))
}
}
}
#[inline]
fn map_internal_err<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce(NetworkError) -> M,
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => Err(internal_rpc_err(op(err))),
}
}
#[inline]
fn map_internal_err_with_data<'a, F, M>(self, op: F) -> RpcResult<Ok>
where
F: FnOnce(NetworkError) -> (M, &'a [u8]),
M: Into<String>,
{
match self {
Ok(t) => Ok(t),
Err(err) => {
let (msg, data) = op(err);
Err(internal_rpc_err_with_data(msg, data))
}
}
}
#[inline]
fn with_message(self, msg: &str) -> RpcResult<Ok> {
match self {
Ok(t) => Ok(t),
Err(err) => {
let msg = format!("{msg}: {err:?}");
Err(internal_rpc_err(msg))
}
}
}
}
impl_to_rpc_result!(reth_interfaces::Error);
impl_to_rpc_result!(reth_network_api::NetworkError);
/// Constructs an internal JSON-RPC error.
pub(crate) fn internal_rpc_err(msg: impl Into<String>) -> jsonrpsee::core::Error {