chore: move stuff around for the new endpoints

Author: Evalir

crates/rpc/src/ctx.rs

@@ -1,8 +1,8 @@
 use crate::{
-    eth::{EthError, TxCacheForwarder},
+    eth::EthError,
     interest::{ActiveFilter, FilterManager, FilterOutput, SubscriptionManager},
     util::BlockRangeInclusiveIter,
-    Pnt,
+    Pnt, TxCacheForwarder,
 };
 use alloy::{
     consensus::{BlockHeader, Header, Signed, Transaction, TxEnvelope},

crates/rpc/src/eth/endpoints.rs

@@ -2,6 +2,7 @@ use crate::{
     ctx::RpcCtx,
     eth::{CallErrorData, EthError},
     interest::{FilterOutput, InterestKind},
+    util::await_jh_option,
     Pnt,
 };
 use ajj::{HandlerCtx, ResponsePayload};
@@ -31,15 +32,6 @@ use std::borrow::Cow;
 use tracing::{trace_span, Instrument};
 use trevm::revm::context::result::ExecutionResult;
 
-macro_rules! await_jh_option {
-    ($h:expr) => {
-        match $h.await {
-            Ok(Some(res)) => res,
-            _ => return Err("task panicked or cancelled".to_string()),
-        }
-    };
-}
-
 macro_rules! await_jh_option_response {
     ($h:expr) => {
         match $h.await {

crates/rpc/src/eth/mod.rs

@@ -4,9 +4,6 @@ use endpoints::*;
 mod error;
 pub use error::EthError;
 
-mod forwarder;
-pub use forwarder::TxCacheForwarder;
-
 mod helpers;
 pub use helpers::CallErrorData;
 

crates/rpc/src/eth/forwarder.rs crates/rpc/src/forwarder.rscrates/rpc/src/eth/forwarder.rs renamed to crates/rpc/src/forwarder.rs

@@ -47,13 +47,16 @@ mod ctx;
 pub use ctx::RpcCtx;
 
 mod eth;
-pub use eth::{eth, CallErrorData, EthError, TxCacheForwarder};
+pub use eth::{eth, CallErrorData, EthError};
 
 mod signet;
 pub use signet::signet;
 
 mod interest;
 
+mod forwarder;
+use forwarder::TxCacheForwarder;
+
 pub(crate) mod util;
 pub use util::Pnt;
 

crates/rpc/src/lib.rs

@@ -2,6 +2,16 @@ use reth::{primitives::EthPrimitives, providers::providers::ProviderNodeTypes};
 use reth_chainspec::ChainSpec;
 use std::{iter::StepBy, ops::RangeInclusive};
 
+macro_rules! await_jh_option {
+    ($h:expr) => {
+        match $h.await {
+            Ok(Some(res)) => res,
+            _ => return Err("task panicked or cancelled".to_string()),
+        }
+    };
+}
+pub(crate) use await_jh_option;
+
 /// Convenience trait for specifying the [`ProviderNodeTypes`] implementation
 /// required for Signet RPC functionality.
 pub trait Pnt: ProviderNodeTypes<ChainSpec = ChainSpec, Primitives = EthPrimitives> {}