From c230b71f9d632048977c682853e416fad0b87bcf Mon Sep 17 00:00:00 2001 From: Christian Langenbacher Date: Fri, 3 May 2024 15:06:10 +0200 Subject: [PATCH] fmt --- cumulus/polkadot-parachain/src/service/mod.rs | 27 ++++++++++--------- .../start_nodes/asset_hub_lookahead.rs | 7 +++-- .../src/service/start_nodes/mod.rs | 4 +-- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cumulus/polkadot-parachain/src/service/mod.rs b/cumulus/polkadot-parachain/src/service/mod.rs index 7df3b7a037b0..609fee080cff 100644 --- a/cumulus/polkadot-parachain/src/service/mod.rs +++ b/cumulus/polkadot-parachain/src/service/mod.rs @@ -14,35 +14,36 @@ // You should have received a copy of the GNU General Public License // along with Cumulus. If not, see . -mod start_nodes; mod consensus; +mod new_partial; mod rpc_extensions; mod start_node_impl; -mod new_partial; +mod start_nodes; use cumulus_client_consensus_aura::collators::lookahead::{self as aura, Params as AuraParams}; use cumulus_client_consensus_common::ParachainBlockImport as TParachainBlockImport; -use sc_executor::{ WasmExecutor}; +use sc_executor::WasmExecutor; use sc_service::{PartialComponents, TFullBackend, TFullClient}; use sc_telemetry::{Telemetry, TelemetryWorkerHandle}; -use std::{sync::Arc}; +use std::sync::Arc; // Exports from the service module -pub use start_nodes::{ - asset_hub_lookahead::start_asset_hub_lookahead_node, - basic_lookahead::start_basic_lookahead_node, - generic_aura_lookahead::start_generic_aura_lookahead_node, - rococo_contracts::start_contracts_rococo_node, rococo_parachain::start_rococo_parachain_node, - shell::{start_shell_node, build_shell_import_queue}, -}; -pub use start_node_impl::start_node_impl; pub use consensus::{ lookahead_aura_consensus::{build_aura_import_queue, start_lookahead_aura_consensus}, relay_chain_consensus::build_relay_to_aura_import_queue, }; pub use new_partial::new_partial; pub use rpc_extensions::{build_contracts_rpc_extensions, build_parachain_rpc_extensions}; +pub use start_node_impl::start_node_impl; +pub use start_nodes::{ + asset_hub_lookahead::start_asset_hub_lookahead_node, + basic_lookahead::start_basic_lookahead_node, + generic_aura_lookahead::start_generic_aura_lookahead_node, + rococo_contracts::start_contracts_rococo_node, + rococo_parachain::start_rococo_parachain_node, + shell::{build_shell_import_queue, start_shell_node}, +}; /// Module with common types. /// @@ -50,7 +51,7 @@ pub use rpc_extensions::{build_contracts_rpc_extensions, build_parachain_rpc_ext /// Proxying the imports paths via this module makes it possible to only adjust imports here, as /// opposed to replacing `parachains_common` imports in every file. pub mod common_types { - pub use parachains_common::{AuraId, AccountId, Balance, Block, Hash, Nonce, Header}; + pub use parachains_common::{AccountId, AuraId, Balance, Block, Hash, Header, Nonce}; } use common_types::Block; diff --git a/cumulus/polkadot-parachain/src/service/start_nodes/asset_hub_lookahead.rs b/cumulus/polkadot-parachain/src/service/start_nodes/asset_hub_lookahead.rs index bc7e7a165dd8..b522f409eb61 100644 --- a/cumulus/polkadot-parachain/src/service/start_nodes/asset_hub_lookahead.rs +++ b/cumulus/polkadot-parachain/src/service/start_nodes/asset_hub_lookahead.rs @@ -15,10 +15,9 @@ // along with Cumulus. If not, see . use crate::service::{ - aura, build_parachain_rpc_extensions, - build_relay_to_aura_import_queue, start_node_impl, AuraParams, - ParachainClient, - common_types::{AccountId, Balance, Block, Hash, Nonce} + aura, build_parachain_rpc_extensions, build_relay_to_aura_import_queue, + common_types::{AccountId, Balance, Block, Hash, Nonce}, + start_node_impl, AuraParams, ParachainClient, }; use codec::{Codec, Decode}; use cumulus_client_cli::CollatorOptions; diff --git a/cumulus/polkadot-parachain/src/service/start_nodes/mod.rs b/cumulus/polkadot-parachain/src/service/start_nodes/mod.rs index 2f550c3bc986..967ab5aa482a 100644 --- a/cumulus/polkadot-parachain/src/service/start_nodes/mod.rs +++ b/cumulus/polkadot-parachain/src/service/start_nodes/mod.rs @@ -17,8 +17,8 @@ //! Contains logic for starting different collator nodes. pub mod asset_hub_lookahead; -pub mod rococo_contracts; -pub mod shell; pub mod basic_lookahead; pub mod generic_aura_lookahead; +pub mod rococo_contracts; pub mod rococo_parachain; +pub mod shell;