Skip to content

Commit 586976f

Browse files
authored
feat(examples): Replace redundant type definitions with a CustomPooledTransaction alias in the custom_node example (#16554)
1 parent 493bbe1 commit 586976f

File tree

3 files changed

+17
-22
lines changed

3 files changed

+17
-22
lines changed

examples/custom-node/src/lib.rs

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,13 @@
88
#![cfg_attr(not(test), warn(unused_crate_dependencies))]
99

1010
use crate::{
11-
evm::CustomExecutorBuilder,
12-
network::CustomNetworkPrimitives,
13-
primitives::{CustomTransaction, CustomTransactionEnvelope},
11+
evm::CustomExecutorBuilder, network::CustomNetworkPrimitives, pool::CustomPooledTransaction,
12+
primitives::CustomTransaction,
1413
};
1514
use chainspec::CustomChainSpec;
1615
use consensus::CustomConsensusBuilder;
17-
use op_alloy_consensus::OpPooledTransaction;
1816
use primitives::CustomNodePrimitives;
19-
use reth_ethereum::{
20-
node::api::{FullNodeTypes, NodeTypes},
21-
primitives::Extended,
22-
};
17+
use reth_ethereum::node::api::{FullNodeTypes, NodeTypes};
2318
use reth_node_builder::{
2419
components::{BasicPayloadServiceBuilder, ComponentsBuilder},
2520
Node,
@@ -35,6 +30,7 @@ pub mod engine;
3530
pub mod engine_api;
3631
pub mod evm;
3732
pub mod network;
33+
pub mod pool;
3834
pub mod primitives;
3935

4036
#[derive(Debug, Clone)]
@@ -54,17 +50,9 @@ where
5450
{
5551
type ComponentsBuilder = ComponentsBuilder<
5652
N,
57-
OpPoolBuilder<
58-
txpool::OpPooledTransaction<
59-
CustomTransaction,
60-
Extended<OpPooledTransaction, CustomTransactionEnvelope>,
61-
>,
62-
>,
53+
OpPoolBuilder<txpool::OpPooledTransaction<CustomTransaction, CustomPooledTransaction>>,
6354
BasicPayloadServiceBuilder<OpPayloadBuilder>,
64-
OpNetworkBuilder<
65-
CustomNetworkPrimitives,
66-
Extended<OpPooledTransaction, CustomTransactionEnvelope>,
67-
>,
55+
OpNetworkBuilder<CustomNetworkPrimitives, CustomPooledTransaction>,
6856
CustomExecutorBuilder,
6957
CustomConsensusBuilder,
7058
>;
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
use crate::primitives::{CustomHeader, CustomTransaction, CustomTransactionEnvelope};
1+
use crate::{
2+
pool::CustomPooledTransaction,
3+
primitives::{CustomHeader, CustomTransaction},
4+
};
25
use alloy_consensus::{Block, BlockBody};
3-
use op_alloy_consensus::OpPooledTransaction;
4-
use reth_ethereum::{network::NetworkPrimitives, primitives::Extended};
6+
use reth_ethereum::network::NetworkPrimitives;
57
use reth_op::OpReceipt;
68

79
#[derive(Debug, Default, Clone, Copy, PartialEq, Eq, Hash)]
@@ -13,6 +15,6 @@ impl NetworkPrimitives for CustomNetworkPrimitives {
1315
type BlockBody = BlockBody<CustomTransaction, CustomHeader>;
1416
type Block = Block<CustomTransaction, CustomHeader>;
1517
type BroadcastedTransaction = CustomTransaction;
16-
type PooledTransaction = Extended<OpPooledTransaction, CustomTransactionEnvelope>;
18+
type PooledTransaction = CustomPooledTransaction;
1719
type Receipt = OpReceipt;
1820
}

examples/custom-node/src/pool.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
use crate::primitives::CustomTransactionEnvelope;
2+
use op_alloy_consensus::OpPooledTransaction;
3+
use reth_ethereum::primitives::Extended;
4+
5+
pub type CustomPooledTransaction = Extended<OpPooledTransaction, CustomTransactionEnvelope>;

0 commit comments

Comments
 (0)