rebase issues

client/consensus/common/src/lib.rs

@@ -16,7 +16,6 @@
 
 use polkadot_primitives::v2::{Hash as PHash, PersistedValidationData};
 
-
 use sc_client_api::Backend;
 use sc_consensus::{shared_data::SharedData, BlockImport, ImportResult};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
@@ -26,7 +25,6 @@ use std::sync::Arc;
 mod level_monitor;
 mod parachain_consensus;
 
-mod parachain_consensus;
 #[cfg(test)]
 mod tests;
 

client/service/src/lib.rs

@@ -47,16 +47,14 @@ use sp_core::traits::SpawnNamed;
 use sp_runtime::traits::Block as BlockT;
 
 use futures::channel::mpsc;
+use sp_runtime::traits::BlockIdTo;
 use std::{sync::Arc, time::Duration};
 
 // Given the sporadic nature of the explicit recovery operation and the
 // possibility to retry infinite times this value is more than enough.
 // In practice here we expect no more than one queued messages.
 const RECOVERY_CHAN_SIZE: usize = 8;
 
-
-use sp_runtime::traits::{Block as BlockT, BlockIdTo};
-use std::{sync::Arc, time::Duration};
 /// Parameters given to [`start_collator`].
 pub struct StartCollatorParams<'a, Block: BlockT, BS, Client, RCInterface, Spawner> {
 	pub block_status: Arc<BS>,
@@ -276,8 +274,6 @@ pub async fn build_relay_chain_interface(
 	}
 }
 
-
-
 /// Parameters given to [`build_network`].
 pub struct BuildNetworkParams<
 	'a,

parachain-template/node/src/service.rs

@@ -13,8 +13,8 @@ use cumulus_client_consensus_common::{
 	ParachainBlockImport as TParachainBlockImport, ParachainConsensus,
 };
 use cumulus_client_service::{
-	build_relay_chain_interface, prepare_node_config, start_collator, start_full_node,
-	StartCollatorParams, StartFullNodeParams,
+	build_network, build_relay_chain_interface, prepare_node_config, start_collator,
+	start_full_node, BuildNetworkParams, StartCollatorParams, StartFullNodeParams,
 };
 use cumulus_primitives_core::ParaId;
 use cumulus_relay_chain_interface::{RelayChainError, RelayChainInterface};
@@ -29,8 +29,6 @@ use sc_telemetry::{Telemetry, TelemetryHandle, TelemetryWorker, TelemetryWorkerH
 use sp_keystore::SyncCryptoStorePtr;
 use substrate_prometheus_endpoint::Registry;
 
-use polkadot_service::CollatorPair;
-
 /// Native executor type.
 pub struct ParachainNativeExecutor;
 
@@ -168,7 +166,6 @@ async fn start_node_impl(
 		s => s.to_string().into(),
 	})?;
 
-
 	let force_authoring = parachain_config.force_authoring;
 	let validator = parachain_config.role.is_authority();
 	let prometheus_registry = parachain_config.prometheus_registry().cloned();
@@ -180,7 +177,7 @@ async fn start_node_impl(
 			parachain_config: &parachain_config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
-			para_id: id,
+			para_id,
 			task_manager: &mut task_manager,
 			relay_chain_interface: relay_chain_interface.clone(),
 			import_queue: params.import_queue,

polkadot-parachain/src/service.rs

@@ -21,8 +21,8 @@ use cumulus_client_consensus_common::{
 	ParachainBlockImport as TParachainBlockImport, ParachainCandidate, ParachainConsensus,
 };
 use cumulus_client_service::{
-	build_relay_chain_interface, prepare_node_config, start_collator, start_full_node,
-	StartCollatorParams, StartFullNodeParams,
+	build_network, build_relay_chain_interface, prepare_node_config, start_collator,
+	start_full_node, BuildNetworkParams, StartCollatorParams, StartFullNodeParams,
 };
 use cumulus_primitives_core::{
 	relay_chain::v2::{Hash as PHash, PersistedValidationData},

zombienet/tests/0007-full_node_warp_sync.feature

@@ -8,10 +8,10 @@ charlie: is up
 dave: is up
 eve: is up
 ferdie: is up
-george: is up
-george: pause
+one: is up
+one: pause
 alice: parachain 2000 is registered within 225 seconds
 dave: reports block height is at least 7 within 250 seconds
 eve: reports block height is at least 7 within 250 seconds
-george: resume
-george: reports block height is at least 7 within 250 seconds
+one: resume
+one: reports block height is at least 7 within 250 seconds

zombienet/tests/0007-full_node_warp_sync.toml

@@ -50,9 +50,9 @@ cumulus_based = true
   args = ["--reserved-only", "--reserved-nodes {{'charlie'|zombie('multiAddress')}}", "--relay-chain-rpc-url {{'alice'|zombie('wsUri')}}"]
 
 
-  # run cumulus george (a parachain full node) and wait for it to sync some blocks
+  # run cumulus one (a parachain full node) and wait for it to sync some blocks
   [[parachains.collators]]
-  name = "george"
+  name = "one"
   validator = false
   image = "{{COL_IMAGE}}"
   command = "test-parachain"