refactor: remove SyncstateUpdater generics and use boxed instead (#2534)

This commit is contained in:
Matthias Seitz
2023-05-03 13:57:28 +02:00
committed by GitHub
parent 3be635406f
commit 90fa586ced
9 changed files with 51 additions and 68 deletions

View File

@ -11,9 +11,7 @@ use reth_downloaders::{
bodies::bodies::BodiesDownloaderBuilder,
headers::reverse_headers::ReverseHeadersDownloaderBuilder, test_utils::FileClient,
};
use reth_interfaces::{
consensus::Consensus, p2p::headers::client::NoopStatusUpdater, sync::SyncStateUpdater,
};
use reth_interfaces::{consensus::Consensus, p2p::headers::client::NoopStatusUpdater};
use reth_primitives::{ChainSpec, H256};
use reth_staged_sync::{
utils::{
@ -131,7 +129,7 @@ impl ImportCommand {
db: Arc<Env<WriteMap>>,
consensus: &Arc<C>,
file_client: Arc<FileClient>,
) -> eyre::Result<(Pipeline<Env<WriteMap>, impl SyncStateUpdater>, impl Stream<Item = NodeEvent>)>
) -> eyre::Result<(Pipeline<Env<WriteMap>>, impl Stream<Item = NodeEvent>)>
where
C: Consensus + 'static,
{

View File

@ -425,7 +425,7 @@ impl Command {
consensus: Arc<dyn Consensus>,
db: Arc<Env<WriteMap>>,
task_executor: &TaskExecutor,
) -> eyre::Result<Pipeline<Env<WriteMap>, NetworkHandle>>
) -> eyre::Result<Pipeline<Env<WriteMap>>>
where
Client: HeadersClient + BodiesClient + Clone + 'static,
{
@ -633,7 +633,7 @@ impl Command {
consensus: Arc<dyn Consensus>,
max_block: Option<u64>,
continuous: bool,
) -> eyre::Result<Pipeline<Env<WriteMap>, U>>
) -> eyre::Result<Pipeline<Env<WriteMap>>>
where
H: HeaderDownloader + 'static,
B: BodyDownloader + 'static,