Cleanup light client leftovers (#5794)

* Cleanup light client leftovers

* Remove light clent leftovers in test-parachains

* update lockfile for {"substrate"}

Co-authored-by: parity-processbot <>

polkadot/cli/src/command.rs

@@ -21,7 +21,7 @@ use log::info;
 use polkadot_client::benchmarking::{
 	benchmark_inherent_data, ExistentialDepositProvider, RemarkBuilder, TransferKeepAliveBuilder,
 };
-use sc_cli::{Role, RuntimeVersion, SubstrateCli};
+use sc_cli::{RuntimeVersion, SubstrateCli};
 use service::{self, HeaderBackend, IdentifyVariant};
 use sp_core::crypto::Ss58AddressFormatRegistry;
 use sp_keyring::Sr25519Keyring;
@@ -330,11 +330,7 @@ where
 			None
 		};
 
-		let role = config.role.clone();
+		service::build_full(
-
-		match role {
-			Role::Light => Err(Error::Other("Light client not enabled".into())),
-			_ => service::build_full(
 			config,
 			service::IsCollator::No,
 			grandpa_pause,
@@ -347,8 +343,7 @@ where
 			hwbench,
 		)
 		.map(|full| full.task_manager)
-			.map_err(Into::into),
+		.map_err(Into::into)
-		}
 	})
 }
 

polkadot/parachain/test-parachains/adder/collator/src/main.rs

@@ -20,7 +20,7 @@ use polkadot_cli::{Error, Result};
 use polkadot_node_primitives::CollationGenerationConfig;
 use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
 use polkadot_primitives::v2::Id as ParaId;
-use sc_cli::{Error as SubstrateCliError, Role, SubstrateCli};
+use sc_cli::{Error as SubstrateCliError, SubstrateCli};
 use sp_core::hexdisplay::HexDisplay;
 use test_parachain_adder_collator::Collator;
 
@@ -54,11 +54,6 @@ fn main() -> Result<()> {
 			})?;
 
 			runner.run_node_until_exit(|config| async move {
-				let role = config.role.clone();
-
-				match role {
-					Role::Light => Err("Light client not supported".into()),
-					_ => {
 				let collator = Collator::new();
 
 				let full_node = polkadot_service::build_full(
@@ -83,8 +78,7 @@ fn main() -> Result<()> {
 				let validation_code_hex =
 					format!("0x{:?}", HexDisplay::from(&collator.validation_code()));
 
-						let para_id =
+				let para_id = cli.run.parachain_id.map(ParaId::from).unwrap_or(DEFAULT_PARA_ID);
-							cli.run.parachain_id.map(ParaId::from).unwrap_or(DEFAULT_PARA_ID);
 
 				log::info!("Running adder collator for parachain id: {}", para_id);
 				log::info!("Genesis state: {}", genesis_head_hex);
@@ -105,8 +99,6 @@ fn main() -> Result<()> {
 					.await;
 
 				Ok(full_node.task_manager)
-					},
-				}
 			})
 		},
 	}?;

polkadot/parachain/test-parachains/undying/collator/src/main.rs

@@ -20,7 +20,7 @@ use polkadot_cli::{Error, Result};
 use polkadot_node_primitives::CollationGenerationConfig;
 use polkadot_node_subsystem::messages::{CollationGenerationMessage, CollatorProtocolMessage};
 use polkadot_primitives::v2::Id as ParaId;
-use sc_cli::{Error as SubstrateCliError, Role, SubstrateCli};
+use sc_cli::{Error as SubstrateCliError, SubstrateCli};
 use sp_core::hexdisplay::HexDisplay;
 use test_parachain_undying_collator::Collator;
 
@@ -54,11 +54,6 @@ fn main() -> Result<()> {
 			})?;
 
 			runner.run_node_until_exit(|config| async move {
-				let role = config.role.clone();
-
-				match role {
-					Role::Light => Err("Light client not supported".into()),
-					_ => {
 				let collator = Collator::new(cli.run.pov_size, cli.run.pvf_complexity);
 
 				let full_node = polkadot_service::build_full(
@@ -104,8 +99,6 @@ fn main() -> Result<()> {
 					.await;
 
 				Ok(full_node.task_manager)
-					},
-				}
 			})
 		},
 	}?;