From 5c1d1c3ef42270355499bb9bf56a220dd4ce75e7 Mon Sep 17 00:00:00 2001 From: Robert Habermeier Date: Thu, 13 Jul 2023 20:17:13 +0100 Subject: [PATCH] update polkadot-parachain crate --- client/collator/src/lib.rs | 1 + polkadot-parachain/src/service.rs | 155 +++++++++++++++--------------- 2 files changed, 76 insertions(+), 80 deletions(-) diff --git a/client/collator/src/lib.rs b/client/collator/src/lib.rs index b2e628551b06..06ed4ee2ec06 100644 --- a/client/collator/src/lib.rs +++ b/client/collator/src/lib.rs @@ -376,6 +376,7 @@ mod tests { spawner.spawn("overseer", None, overseer.run().then(|_| async {}).boxed()); + #[allow(deprecated)] let collator_start = start_collator(StartCollatorParams { runtime_api: client.clone(), block_status: client.clone(), diff --git a/polkadot-parachain/src/service.rs b/polkadot-parachain/src/service.rs index 552c6b4a832b..65ecc69baa5d 100644 --- a/polkadot-parachain/src/service.rs +++ b/polkadot-parachain/src/service.rs @@ -21,9 +21,11 @@ use cumulus_client_consensus_common::{ ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus, }; use cumulus_client_service::{ - build_network, build_relay_chain_interface, prepare_node_config, start_collator, - start_full_node, BuildNetworkParams, StartCollatorParams, StartFullNodeParams, + build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, + DARecoveryProfile, StartRelayChainTasksParams, BuildNetworkParams, }; +#[allow(deprecated)] +use cumulus_client_service::old_consensus; use cumulus_primitives_core::{ relay_chain::{Hash as PHash, PersistedValidationData}, ParaId, @@ -466,6 +468,23 @@ where .overseer_handle() .map_err(|e| sc_service::Error::Application(Box::new(e)))?; + start_relay_chain_tasks(StartRelayChainTasksParams { + client: client.clone(), + announce_block: announce_block.clone(), + para_id, + relay_chain_interface: relay_chain_interface.clone(), + task_manager: &mut task_manager, + da_recovery_profile: if validator { + DARecoveryProfile::Collator + } else { + DARecoveryProfile::FullNode + }, + import_queue: import_queue_service, + relay_chain_slot_duration, + recovery_handle: Box::new(overseer_handle.clone()), + sync_service: sync_service.clone(), + }).await?; + if validator { let parachain_consensus = build_consensus( client.clone(), @@ -482,37 +501,17 @@ where let spawner = task_manager.spawn_handle(); - let params = StartCollatorParams { + #[allow(deprecated)] + old_consensus::start_collator(old_consensus::StartCollatorParams { para_id, + runtime_api: client.clone(), block_status: client.clone(), announce_block, - client: client.clone(), - task_manager: &mut task_manager, - relay_chain_interface, + overseer_handle, spawner, + key: collator_key.expect("Command line arguments do not allow this. qed"), parachain_consensus, - import_queue: import_queue_service, - collator_key: collator_key.expect("Command line arguments do not allow this. qed"), - relay_chain_slot_duration, - recovery_handle: Box::new(overseer_handle), - sync_service, - }; - - start_collator(params).await?; - } else { - let params = StartFullNodeParams { - client: client.clone(), - announce_block, - task_manager: &mut task_manager, - para_id, - relay_chain_interface, - relay_chain_slot_duration, - import_queue: import_queue_service, - recovery_handle: Box::new(overseer_handle), - sync_service, - }; - - start_full_node(params)?; + }).await; } start_network.start_network(); @@ -669,6 +668,24 @@ where let overseer_handle = relay_chain_interface .overseer_handle() .map_err(|e| sc_service::Error::Application(Box::new(e)))?; + + start_relay_chain_tasks(StartRelayChainTasksParams { + client: client.clone(), + announce_block: announce_block.clone(), + para_id, + relay_chain_interface: relay_chain_interface.clone(), + task_manager: &mut task_manager, + da_recovery_profile: if validator { + DARecoveryProfile::Collator + } else { + DARecoveryProfile::FullNode + }, + import_queue: import_queue_service, + relay_chain_slot_duration, + recovery_handle: Box::new(overseer_handle.clone()), + sync_service: sync_service.clone(), + }).await?; + if validator { let parachain_consensus = build_consensus( client.clone(), @@ -685,37 +702,17 @@ where let spawner = task_manager.spawn_handle(); - let params = StartCollatorParams { + #[allow(deprecated)] + old_consensus::start_collator(old_consensus::StartCollatorParams { para_id, + runtime_api: client.clone(), block_status: client.clone(), announce_block, - client: client.clone(), - task_manager: &mut task_manager, - relay_chain_interface: relay_chain_interface.clone(), + overseer_handle, spawner, + key: collator_key.expect("Command line arguments do not allow this. qed"), parachain_consensus, - import_queue: import_queue_service, - collator_key: collator_key.expect("Command line arguments do not allow this. qed"), - relay_chain_slot_duration, - recovery_handle: Box::new(overseer_handle), - sync_service, - }; - - start_collator(params).await?; - } else { - let params = StartFullNodeParams { - client: client.clone(), - announce_block, - task_manager: &mut task_manager, - para_id, - relay_chain_interface, - relay_chain_slot_duration, - import_queue: import_queue_service, - recovery_handle: Box::new(overseer_handle), - sync_service, - }; - - start_full_node(params)?; + }).await; } start_network.start_network(); @@ -1442,6 +1439,24 @@ where let overseer_handle = relay_chain_interface .overseer_handle() .map_err(|e| sc_service::Error::Application(Box::new(e)))?; + + start_relay_chain_tasks(StartRelayChainTasksParams { + client: client.clone(), + announce_block: announce_block.clone(), + para_id, + relay_chain_interface: relay_chain_interface.clone(), + task_manager: &mut task_manager, + da_recovery_profile: if validator { + DARecoveryProfile::Collator + } else { + DARecoveryProfile::FullNode + }, + import_queue: import_queue_service, + relay_chain_slot_duration, + recovery_handle: Box::new(overseer_handle.clone()), + sync_service: sync_service.clone(), + }).await?; + if validator { let parachain_consensus = build_consensus( client.clone(), @@ -1458,37 +1473,17 @@ where let spawner = task_manager.spawn_handle(); - let params = StartCollatorParams { + #[allow(deprecated)] + old_consensus::start_collator(old_consensus::StartCollatorParams { para_id, + runtime_api: client.clone(), block_status: client.clone(), announce_block, - client: client.clone(), - task_manager: &mut task_manager, - relay_chain_interface, + overseer_handle, spawner, + key: collator_key.expect("Command line arguments do not allow this. qed"), parachain_consensus, - import_queue: import_queue_service, - collator_key: collator_key.expect("Command line arguments do not allow this. qed"), - relay_chain_slot_duration, - recovery_handle: Box::new(overseer_handle), - sync_service, - }; - - start_collator(params).await?; - } else { - let params = StartFullNodeParams { - client: client.clone(), - announce_block, - task_manager: &mut task_manager, - para_id, - relay_chain_interface, - relay_chain_slot_duration, - import_queue: import_queue_service, - recovery_handle: Box::new(overseer_handle), - sync_service, - }; - - start_full_node(params)?; + }).await; } start_network.start_network();