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

chore(rpc): use consistent generic type order (#1291)

Browse Source
This commit is contained in:
Matthias Seitz
2023-02-11 15:38:19 +01:00
committed by GitHub
parent afb6671a0f
commit 4b0acce957
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crates/rpc/rpc/src/eth/filter.rs
View File

@ -9,12 +9,12 @@ use std::sync::Arc;
/// `Eth` filter RPC implementation.
#[derive(Debug, Clone)]
pub struct EthFilter<Pool, Client> {
pub struct EthFilter<Client, Pool> {
/// All nested fields bundled together.
inner: Arc<EthFilterInner<Pool, Client>>,
inner: Arc<EthFilterInner<Client, Pool>>,
}
impl<Pool, Client> EthFilter<Pool, Client> {
impl<Client, Pool> EthFilter<Client, Pool> {
/// Creates a new, shareable instance.
pub fn new(client: Arc<Client>, pool: Pool) -> Self {
let inner = EthFilterInner { client, pool };
@ -23,10 +23,10 @@ impl<Pool, Client> EthFilter<Pool, Client> {
}
#[async_trait]
impl<Pool, Client> EthFilterApiServer for EthFilter<Pool, Client>
impl<Client, Pool> EthFilterApiServer for EthFilter<Client, Pool>
where
Pool: TransactionPool + 'static,
Client: BlockProvider + 'static,
Pool: TransactionPool + 'static,
{
fn new_filter(&self, _filter: Filter) -> RpcResult<U256> {
todo!()
@ -59,7 +59,7 @@ where
/// Container type `EthFilter`
#[derive(Debug)]
struct EthFilterInner<Pool, Client> {
struct EthFilterInner<Client, Pool> {
/// The transaction pool.
pool: Pool,
/// The client that can interact with the chain.

14
crates/rpc/rpc/src/eth/pubsub.rs
View File

@ -11,14 +11,14 @@ use std::sync::Arc;
///
/// This handles
#[derive(Debug, Clone)]
pub struct EthPubSub<Pool, Client> {
pub struct EthPubSub<Client, Pool> {
/// All nested fields bundled together.
inner: Arc<EthPubSubInner<Pool, Client>>,
inner: Arc<EthPubSubInner<Client, Pool>>,
}
// === impl EthPubSub ===
impl<Pool, Client> EthPubSub<Pool, Client> {
impl<Client, Pool> EthPubSub<Client, Pool> {
/// Creates a new, shareable instance.
pub fn new(client: Arc<Client>, pool: Pool) -> Self {
let inner = EthPubSubInner { client, pool };
@ -26,10 +26,10 @@ impl<Pool, Client> EthPubSub<Pool, Client> {
}
}
impl<Pool, Client> EthPubSubApiServer for EthPubSub<Pool, Client>
impl<Client, Pool> EthPubSubApiServer for EthPubSub<Client, Pool>
where
Pool: TransactionPool + 'static,
Client: BlockProvider + 'static,
Pool: TransactionPool + 'static,
{
fn subscribe(
&self,
@ -43,7 +43,7 @@ where
}
/// The actual handler for and accepted [`EthPubSub::subscribe`] call.
async fn handle_accepted<Pool, Client>(
async fn handle_accepted<Client, Pool>(
_pool: Pool,
_client: Arc<Client>,
_accepted_sink: SubscriptionSink,
@ -54,7 +54,7 @@ async fn handle_accepted<Pool, Client>(
/// Container type `EthPubSub`
#[derive(Debug)]
struct EthPubSubInner<Pool, Client> {
struct EthPubSubInner<Client, Pool> {
/// The transaction pool.
pool: Pool,
/// The client that can interact with the chain.