Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(network): added NetworkConfigBuilder.block_import(..) #5783

Merged
merged 3 commits into from
Dec 15, 2023
Merged

feat(network): added NetworkConfigBuilder.block_import(..) #5783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dcd0dc6
added `block_import` to `NetworkConfigBuilder`
lmittmann Dec 15, 2023
57f0f52
export `message` and `import`
lmittmann Dec 15, 2023
1f83b32
fixed missing docs
lmittmann Dec 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion crates/net/network/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,9 @@ pub struct NetworkConfigBuilder {
head: Option<Head>,
/// Whether tx gossip is disabled
tx_gossip_disabled: bool,
/// The block importer type
#[serde(skip)]
block_import: Option<Box<dyn BlockImport>>,
/// Optimism Network Config Builder
#[cfg(feature = "optimism")]
optimism_network_config: OptimismNetworkConfigBuilder,
Expand Down Expand Up @@ -204,6 +207,7 @@ impl NetworkConfigBuilder {
extra_protocols: Default::default(),
head: None,
tx_gossip_disabled: false,
block_import: None,
#[cfg(feature = "optimism")]
optimism_network_config: OptimismNetworkConfigBuilder::default(),
}
Expand Down Expand Up @@ -396,6 +400,12 @@ impl NetworkConfigBuilder {
self
}

/// Sets the block import type.
pub fn block_import(mut self, block_import: Box<dyn BlockImport>) -> Self {
self.block_import = Some(block_import);
self
}

/// Sets the sequencer HTTP endpoint.
#[cfg(feature = "optimism")]
pub fn sequencer_endpoint(mut self, endpoint: Option<String>) -> Self {
Expand Down Expand Up @@ -427,6 +437,7 @@ impl NetworkConfigBuilder {
extra_protocols,
head,
tx_gossip_disabled,
block_import,
#[cfg(feature = "optimism")]
optimism_network_config: OptimismNetworkConfigBuilder { sequencer_endpoint },
} = self;
Expand Down Expand Up @@ -473,7 +484,7 @@ impl NetworkConfigBuilder {
peers_config: peers_config.unwrap_or_default(),
sessions_config: sessions_config.unwrap_or_default(),
chain_spec,
block_import: Box::<ProofOfStakeBlockImport>::default(),
block_import: block_import.unwrap_or(Box::<ProofOfStakeBlockImport>::default()),
network_mode,
executor: executor.unwrap_or_else(|| Box::<TokioTaskExecutor>::default()),
status,
Expand Down
2 changes: 2 additions & 0 deletions crates/net/network/src/import.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
//! This module provides an abstraction over block import in the form of the `BlockImport` trait.

use crate::message::NewBlockMessage;
use reth_primitives::PeerId;
use std::task::{Context, Poll};
Expand Down
4 changes: 2 additions & 2 deletions crates/net/network/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,10 +122,10 @@ pub mod error;
pub mod eth_requests;
mod fetch;
mod flattened_response;
mod import;
pub mod import;
mod listener;
mod manager;
mod message;
pub mod message;
mod metrics;
mod network;
pub mod peers;
Expand Down
6 changes: 6 additions & 0 deletions crates/net/network/src/message.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,11 +158,17 @@ impl PeerRequest {

/// Corresponding variant for [`PeerRequest`].
#[derive(Debug)]
#[allow(missing_docs)]
pub enum PeerResponse {
/// Response to a [`GetBlockHeaders`] request.
BlockHeaders { response: oneshot::Receiver<RequestResult<BlockHeaders>> },
/// Response to a [`GetBlockBodies`] request.
BlockBodies { response: oneshot::Receiver<RequestResult<BlockBodies>> },
/// Response to a [`GetPooledTransactions`] request.
PooledTransactions { response: oneshot::Receiver<RequestResult<PooledTransactions>> },
/// Response to a [`GetNodeData`] request.
NodeData { response: oneshot::Receiver<RequestResult<NodeData>> },
/// Response to a [`GetReceipts`] request.
Receipts { response: oneshot::Receiver<RequestResult<Receipts>> },
}

Expand Down
Loading