diff --git a/client/service/src/lib.rs b/client/service/src/lib.rs index f859e9c2465f..8bae0a51dc4a 100644 --- a/client/service/src/lib.rs +++ b/client/service/src/lib.rs @@ -137,7 +137,10 @@ where // We want that collators wait at maximum the relay chain slot duration before starting // to recover blocks. Additionally, we wait at least half the slot time to give the // relay chain the chance to increase availability. - RecoveryDelayRange { min: relay_chain_slot_duration / 2, max: relay_chain_slot_duration } + RecoveryDelayRange { + min: relay_chain_slot_duration / 2, + max: relay_chain_slot_duration, + } }, DARecoveryProfile::FullNode => { // Full nodes should at least wait 2.5 minutes (assuming 6 seconds slot duration) and diff --git a/parachain-template/node/src/service.rs b/parachain-template/node/src/service.rs index 278dd35d1000..8ee3d4a4a4b0 100644 --- a/parachain-template/node/src/service.rs +++ b/parachain-template/node/src/service.rs @@ -12,12 +12,12 @@ use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, Slo use cumulus_client_consensus_common::{ ParachainBlockImport as TParachainBlockImport, ParachainConsensus, }; -use cumulus_client_service::{ - DARecoveryProfile, - build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, BuildNetworkParams, StartRelayChainTasksParams, -}; #[allow(deprecated)] use cumulus_client_service::old_consensus; +use cumulus_client_service::{ + build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, + BuildNetworkParams, DARecoveryProfile, StartRelayChainTasksParams, +}; use cumulus_primitives_core::ParaId; use cumulus_relay_chain_interface::RelayChainInterface; @@ -297,7 +297,8 @@ async fn start_node_impl( relay_chain_slot_duration, recovery_handle: Box::new(overseer_handle.clone()), sync_service: sync_service.clone(), - }).await?; + }) + .await?; if validator { let parachain_consensus = build_consensus( diff --git a/parachains/runtimes/assets/test-utils/src/test_cases.rs b/parachains/runtimes/assets/test-utils/src/test_cases.rs index 66174e97a6a5..407afd3fe8e0 100644 --- a/parachains/runtimes/assets/test-utils/src/test_cases.rs +++ b/parachains/runtimes/assets/test-utils/src/test_cases.rs @@ -64,8 +64,8 @@ pub fn teleports_for_native_asset_works< + pallet_collator_selection::Config + cumulus_pallet_parachain_system::Config + cumulus_pallet_xcmp_queue::Config, - AllPalletsWithoutSystem: OnInitialize> - + OnFinalize>, + AllPalletsWithoutSystem: + OnInitialize> + OnFinalize>, AccountIdOf: Into<[u8; 32]>, ValidatorIdOf: From>, BalanceOf: From + Into, @@ -319,8 +319,8 @@ pub fn teleports_for_foreign_assets_works< + cumulus_pallet_parachain_system::Config + cumulus_pallet_xcmp_queue::Config + pallet_assets::Config, - AllPalletsWithoutSystem: OnInitialize> - + OnFinalize>, + AllPalletsWithoutSystem: + OnInitialize> + OnFinalize>, AccountIdOf: Into<[u8; 32]>, ValidatorIdOf: From>, BalanceOf: From, diff --git a/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs b/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs index 4dde121a776b..44791be4226b 100644 --- a/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs +++ b/parachains/runtimes/bridge-hubs/test-utils/src/test_cases.rs @@ -309,8 +309,8 @@ pub fn message_dispatch_routing_works< + cumulus_pallet_parachain_system::Config + cumulus_pallet_xcmp_queue::Config + pallet_bridge_messages::Config, - AllPalletsWithoutSystem: OnInitialize> - + OnFinalize>, + AllPalletsWithoutSystem: + OnInitialize> + OnFinalize>, ::AccountId: Into<<::RuntimeOrigin as OriginTrait>::AccountId>, XcmConfig: xcm_executor::Config, diff --git a/parachains/runtimes/test-utils/src/lib.rs b/parachains/runtimes/test-utils/src/lib.rs index ce2a5b033726..e4d20854922c 100644 --- a/parachains/runtimes/test-utils/src/lib.rs +++ b/parachains/runtimes/test-utils/src/lib.rs @@ -24,7 +24,7 @@ use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder; use frame_support::{ dispatch::{DispatchResult, RawOrigin, UnfilteredDispatchable}, inherent::{InherentData, ProvideInherent}, - traits::{OriginTrait, OnInitialize, OnFinalize}, + traits::{OnFinalize, OnInitialize, OriginTrait}, weights::Weight, }; use frame_system::pallet_prelude::{BlockNumberFor, HeaderFor}; @@ -34,7 +34,7 @@ use polkadot_parachain::primitives::{ }; use sp_consensus_aura::{SlotDuration, AURA_ENGINE_ID}; use sp_core::Encode; -use sp_runtime::{BuildStorage, Digest, DigestItem, traits::Header}; +use sp_runtime::{traits::Header, BuildStorage, Digest, DigestItem}; use xcm::{ latest::{MultiAsset, MultiLocation, XcmContext, XcmHash}, prelude::*, @@ -220,8 +220,8 @@ impl where AccountIdOf: Into<<::RuntimeOrigin as OriginTrait>::AccountId>, - AllPalletsWithoutSystem: OnInitialize> - + OnFinalize>, + AllPalletsWithoutSystem: + OnInitialize> + OnFinalize>, { pub fn run_to_block(n: u32, author: AccountId) -> HeaderFor { let mut last_header = None; diff --git a/polkadot-parachain/src/service.rs b/polkadot-parachain/src/service.rs index 65ecc69baa5d..c14ec6ebad59 100644 --- a/polkadot-parachain/src/service.rs +++ b/polkadot-parachain/src/service.rs @@ -20,12 +20,12 @@ use cumulus_client_consensus_aura::{AuraConsensus, BuildAuraConsensusParams, Slo use cumulus_client_consensus_common::{ ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus, }; +#[allow(deprecated)] +use cumulus_client_service::old_consensus; use cumulus_client_service::{ build_network, build_relay_chain_interface, prepare_node_config, start_relay_chain_tasks, - DARecoveryProfile, StartRelayChainTasksParams, BuildNetworkParams, + BuildNetworkParams, DARecoveryProfile, StartRelayChainTasksParams, }; -#[allow(deprecated)] -use cumulus_client_service::old_consensus; use cumulus_primitives_core::{ relay_chain::{Hash as PHash, PersistedValidationData}, ParaId, @@ -483,7 +483,8 @@ where relay_chain_slot_duration, recovery_handle: Box::new(overseer_handle.clone()), sync_service: sync_service.clone(), - }).await?; + }) + .await?; if validator { let parachain_consensus = build_consensus( @@ -511,7 +512,8 @@ where spawner, key: collator_key.expect("Command line arguments do not allow this. qed"), parachain_consensus, - }).await; + }) + .await; } start_network.start_network(); @@ -684,7 +686,8 @@ where relay_chain_slot_duration, recovery_handle: Box::new(overseer_handle.clone()), sync_service: sync_service.clone(), - }).await?; + }) + .await?; if validator { let parachain_consensus = build_consensus( @@ -712,7 +715,8 @@ where spawner, key: collator_key.expect("Command line arguments do not allow this. qed"), parachain_consensus, - }).await; + }) + .await; } start_network.start_network(); @@ -1455,7 +1459,8 @@ where relay_chain_slot_duration, recovery_handle: Box::new(overseer_handle.clone()), sync_service: sync_service.clone(), - }).await?; + }) + .await?; if validator { let parachain_consensus = build_consensus( @@ -1483,7 +1488,8 @@ where spawner, key: collator_key.expect("Command line arguments do not allow this. qed"), parachain_consensus, - }).await; + }) + .await; } start_network.start_network(); diff --git a/test/relay-sproof-builder/src/lib.rs b/test/relay-sproof-builder/src/lib.rs index 08038049ae38..6d172156a3c1 100644 --- a/test/relay-sproof-builder/src/lib.rs +++ b/test/relay-sproof-builder/src/lib.rs @@ -129,7 +129,9 @@ impl RelayStateSproofBuilder { if let Some(para_head) = self.included_para_head { insert(relay_chain::well_known_keys::para_head(self.para_id), para_head.encode()); } - if let Some(relay_dispatch_queue_remaining_capacity) = self.relay_dispatch_queue_remaining_capacity { + if let Some(relay_dispatch_queue_remaining_capacity) = + self.relay_dispatch_queue_remaining_capacity + { insert( relay_chain::well_known_keys::relay_dispatch_queue_remaining_capacity( self.para_id, diff --git a/test/service/src/lib.rs b/test/service/src/lib.rs index d35ee54a2854..facda023ae7c 100644 --- a/test/service/src/lib.rs +++ b/test/service/src/lib.rs @@ -39,11 +39,12 @@ use cumulus_client_consensus_common::{ ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus, }; use cumulus_client_pov_recovery::RecoveryHandle; -use cumulus_client_service::{ - build_network, prepare_node_config, start_relay_chain_tasks, DARecoveryProfile, StartRelayChainTasksParams, BuildNetworkParams, -}; #[allow(deprecated)] use cumulus_client_service::old_consensus; +use cumulus_client_service::{ + build_network, prepare_node_config, start_relay_chain_tasks, BuildNetworkParams, + DARecoveryProfile, StartRelayChainTasksParams, +}; use cumulus_primitives_core::ParaId; use cumulus_relay_chain_inprocess_interface::RelayChainInProcessInterface; use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface, RelayChainResult}; @@ -403,7 +404,8 @@ where relay_chain_slot_duration: relay_chain_slot_duration.clone(), recovery_handle, sync_service: sync_service.clone(), - }).await?; + }) + .await?; if let Some(collator_key) = collator_key { let parachain_consensus: Box> = match consensus { @@ -457,7 +459,8 @@ where parachain_consensus, key: collator_key, overseer_handle, - }).await; + }) + .await; } start_network.start_network();