pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 19:11:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor polkadot-parachain service for more code reuse (#3511)

Browse Source 
This is a refactoring, no changes to the logic are included (if you find
some, report :D).

## Change Overview
In https://github.com/paritytech/polkadot-sdk/issues/2455, dependency on
actual runtimes was removed for the system parachains. This means that
the trait bounds we have on various `start_node_xy` do not check
anything anymore, since they all point to the same runtime. Exception is
asset-hub-polkadot which uses a different key type.

This PR unifies the different nodes as much as possible.
`start_node_impl` is doing the heavy lifting and has been made a bit
more flexible to support the rpc extension instantiation that was there
before.

The generics for `Runtime` and `AuraId` have been removed where
possible. The fake runtime is imported as `FakeRuntime` to make it very
clear to readers that it is not the generic parameter.

Multiple nodes where using the same import queue/start_consensus
closure, they have been unified.

---------

Co-authored-by: Kian Paimani <5588131+kianenigma@users.noreply.github.com>
Co-authored-by: Francisco Aguirre <franciscoaguirreperez@gmail.com>
Co-authored-by: Adrian Catangiu <adrian@parity.io>
Co-authored-by: Egor_P <egor@parity.io>
Co-authored-by: Dmitry Markin <dmitry@markin.tech>
Co-authored-by: Xiliang Chen <xlchen1291@gmail.com>
Co-authored-by: Andrei Eres <eresav@me.com>
Co-authored-by: Alexander Samusev <41779041+alvicsam@users.noreply.github.com>
Co-authored-by: Alin Dima <alin@parity.io>
Co-authored-by: gupnik <nikhilgupta.iitk@gmail.com>
Co-authored-by: Liam Aharon <liam.aharon@hotmail.com>
Co-authored-by: Dónal Murray <donalm@seadanda.dev>
This commit is contained in:
Sebastian Kunert
2024-03-08 00:31:59 +01:00
committed by GitHub
parent f4fbddec42
commit 2aa006e094
2 changed files with 249 additions and 1228 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cumulus/polkadot-parachain/src/command.rs
+20 -64
View File
@@ -399,7 +399,7 @@ macro_rules! construct_partials {
Runtime::AssetHubPolkadot => { Runtime::AssetHubPolkadot => {
let $partials = new_partial::<AssetHubPolkadotRuntimeApi, _>( let $partials = new_partial::<AssetHubPolkadotRuntimeApi, _>(
&$config, &$config,
crate::service::aura_build_import_queue::<_, AssetHubPolkadotAuraId>, crate::service::build_relay_to_aura_import_queue::<_, AssetHubPolkadotAuraId>,
)?; )?;
$code $code
}, },
@@ -413,28 +413,21 @@ macro_rules! construct_partials {
Runtime::People(_) => { Runtime::People(_) => {
let $partials = new_partial::<RuntimeApi, _>( let $partials = new_partial::<RuntimeApi, _>(
&$config, &$config,
crate::service::aura_build_import_queue::<_, AuraId>, crate::service::build_relay_to_aura_import_queue::<_, AuraId>,
)?; )?;
$code $code
}, },
Runtime::GluttonWestend | Runtime::Glutton | Runtime::Shell | Runtime::Seedling => { Runtime::GluttonWestend | Runtime::Glutton | Runtime::Shell | Runtime::Seedling => {
let $partials = new_partial::<RuntimeApi, _>( let $partials = new_partial::<RuntimeApi, _>(
&$config, &$config,
crate::service::shell_build_import_queue, crate::service::build_shell_import_queue,
)?; )?;
$code $code
}, },
Runtime::ContractsRococo => { Runtime::ContractsRococo | Runtime::Penpal(_) | Runtime::Default => {
let $partials = new_partial::<RuntimeApi, _>( let $partials = new_partial::<RuntimeApi, _>(
&$config, &$config,
crate::service::contracts_rococo_build_import_queue, crate::service::build_aura_import_queue,
)?;
$code
},
Runtime::Penpal(_) | Runtime::Default => {
let $partials = new_partial::<RuntimeApi, _>(
&$config,
crate::service::rococo_parachain_build_import_queue,
)?; )?;
$code $code
}, },
@@ -450,7 +443,7 @@ macro_rules! construct_async_run {
runner.async_run(|$config| { runner.async_run(|$config| {
let $components = new_partial::<AssetHubPolkadotRuntimeApi, _>( let $components = new_partial::<AssetHubPolkadotRuntimeApi, _>(
&$config, &$config,
crate::service::aura_build_import_queue::<_, AssetHubPolkadotAuraId>, crate::service::build_relay_to_aura_import_queue::<_, AssetHubPolkadotAuraId>,
)?; )?;
let task_manager = $components.task_manager; let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager)) { $( $code )* }.map(|v| (v, task_manager))
@@ -467,7 +460,7 @@ macro_rules! construct_async_run {
runner.async_run(|$config| { runner.async_run(|$config| {
let $components = new_partial::<RuntimeApi, _>( let $components = new_partial::<RuntimeApi, _>(
&$config, &$config,
crate::service::aura_build_import_queue::<_, AuraId>, crate::service::build_relay_to_aura_import_queue::<_, AuraId>,
)?; )?;
let task_manager = $components.task_manager; let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager)) { $( $code )* }.map(|v| (v, task_manager))
@@ -480,30 +473,20 @@ macro_rules! construct_async_run {
runner.async_run(|$config| { runner.async_run(|$config| {
let $components = new_partial::<RuntimeApi, _>( let $components = new_partial::<RuntimeApi, _>(
&$config, &$config,
crate::service::shell_build_import_queue, crate::service::build_shell_import_queue,
)?; )?;
let task_manager = $components.task_manager; let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager)) { $( $code )* }.map(|v| (v, task_manager))
}) })
} }
Runtime::ContractsRococo => { Runtime::ContractsRococo | Runtime::Penpal(_) | Runtime::Default => {
runner.async_run(|$config| {
let $components = new_partial::<RuntimeApi, _>(
&$config,
crate::service::contracts_rococo_build_import_queue,
)?;
let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager))
})
},
Runtime::Penpal(_) | Runtime::Default => {
runner.async_run(|$config| { runner.async_run(|$config| {
let $components = new_partial::< let $components = new_partial::<
RuntimeApi, RuntimeApi,
_, _,
>( >(
&$config, &$config,
crate::service::rococo_parachain_build_import_queue, crate::service::build_aura_import_queue,
)?; )?;
let task_manager = $components.task_manager; let task_manager = $components.task_manager;
{ $( $code )* }.map(|v| (v, task_manager)) { $( $code )* }.map(|v| (v, task_manager))
@@ -715,25 +698,19 @@ pub fn run() -> Result<()> {
.map_err(Into::into), .map_err(Into::into),
CollectivesPolkadot => CollectivesPolkadot =>
crate::service::start_generic_aura_node::< crate::service::start_generic_aura_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0) .map(|r| r.0)
.map_err(Into::into), .map_err(Into::into),
CollectivesWestend => CollectivesWestend =>
crate::service::start_generic_aura_lookahead_node::< crate::service::start_generic_aura_lookahead_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0) .map(|r| r.0)
.map_err(Into::into), .map_err(Into::into),
Seedling | Shell => Seedling | Shell =>
crate::service::start_shell_node::<RuntimeApi>( crate::service::start_shell_node(
config, config,
polkadot_config, polkadot_config,
collator_options, collator_options,
@@ -758,36 +735,24 @@ pub fn run() -> Result<()> {
BridgeHub(bridge_hub_runtime_type) => match bridge_hub_runtime_type { BridgeHub(bridge_hub_runtime_type) => match bridge_hub_runtime_type {
chain_spec::bridge_hubs::BridgeHubRuntimeType::Polkadot | chain_spec::bridge_hubs::BridgeHubRuntimeType::Polkadot |
chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotLocal => chain_spec::bridge_hubs::BridgeHubRuntimeType::PolkadotLocal =>
crate::service::start_generic_aura_node::< crate::service::start_generic_aura_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0), .map(|r| r.0),
chain_spec::bridge_hubs::BridgeHubRuntimeType::Kusama | chain_spec::bridge_hubs::BridgeHubRuntimeType::Kusama |
chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaLocal => chain_spec::bridge_hubs::BridgeHubRuntimeType::KusamaLocal =>
crate::service::start_generic_aura_node::< crate::service::start_generic_aura_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0), .map(|r| r.0),
chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend | chain_spec::bridge_hubs::BridgeHubRuntimeType::Westend |
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendLocal | chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendLocal |
chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendDevelopment => chain_spec::bridge_hubs::BridgeHubRuntimeType::WestendDevelopment =>
crate::service::start_generic_aura_lookahead_node::< crate::service::start_generic_aura_lookahead_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0), .map(|r| r.0),
chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo | chain_spec::bridge_hubs::BridgeHubRuntimeType::Rococo |
chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal | chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoLocal |
chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoDevelopment => chain_spec::bridge_hubs::BridgeHubRuntimeType::RococoDevelopment =>
crate::service::start_generic_aura_lookahead_node::< crate::service::start_generic_aura_lookahead_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0), .map(|r| r.0),
} }
@@ -800,10 +765,7 @@ pub fn run() -> Result<()> {
chain_spec::coretime::CoretimeRuntimeType::Westend | chain_spec::coretime::CoretimeRuntimeType::Westend |
chain_spec::coretime::CoretimeRuntimeType::WestendLocal | chain_spec::coretime::CoretimeRuntimeType::WestendLocal |
chain_spec::coretime::CoretimeRuntimeType::WestendDevelopment => chain_spec::coretime::CoretimeRuntimeType::WestendDevelopment =>
crate::service::start_generic_aura_lookahead_node::< crate::service::start_generic_aura_lookahead_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0), .map(|r| r.0),
} }
@@ -822,10 +784,7 @@ pub fn run() -> Result<()> {
.map_err(Into::into), .map_err(Into::into),
Glutton | GluttonWestend => Glutton | GluttonWestend =>
crate::service::start_basic_lookahead_node::< crate::service::start_basic_lookahead_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0) .map(|r| r.0)
.map_err(Into::into), .map_err(Into::into),
@@ -837,10 +796,7 @@ pub fn run() -> Result<()> {
chain_spec::people::PeopleRuntimeType::Westend | chain_spec::people::PeopleRuntimeType::Westend |
chain_spec::people::PeopleRuntimeType::WestendLocal | chain_spec::people::PeopleRuntimeType::WestendLocal |
chain_spec::people::PeopleRuntimeType::WestendDevelopment => chain_spec::people::PeopleRuntimeType::WestendDevelopment =>
crate::service::start_generic_aura_lookahead_node::< crate::service::start_generic_aura_lookahead_node(config, polkadot_config, collator_options, id, hwbench)
RuntimeApi,
AuraId,
>(config, polkadot_config, collator_options, id, hwbench)
.await .await
.map(|r| r.0), .map(|r| r.0),
} }
cumulus/polkadot-parachain/src/service.rs
+229 -1164
View File
File diff suppressed because it is too large Load Diff