From 60105a206c1d26d48bb3d9a7d28eafa425549b06 Mon Sep 17 00:00:00 2001 From: Kai <7630809+Kailai-Wang@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:58:25 +0100 Subject: [PATCH] Remove unneeded chain spec criteria (#3243) --- parachain/Cargo.lock | 2 +- parachain/node/Cargo.toml | 2 +- parachain/node/src/command.rs | 88 ++++++----------------------------- 3 files changed, 15 insertions(+), 77 deletions(-) diff --git a/parachain/Cargo.lock b/parachain/Cargo.lock index 045e009c97..90032fc91d 100644 --- a/parachain/Cargo.lock +++ b/parachain/Cargo.lock @@ -5842,7 +5842,7 @@ checksum = "4ee93343901ab17bd981295f2cf0026d4ad018c7c31ba84549a4ddbb47a45104" [[package]] name = "litentry-collator" -version = "0.9.22" +version = "0.9.23" dependencies = [ "async-trait", "clap", diff --git a/parachain/node/Cargo.toml b/parachain/node/Cargo.toml index b81edacd32..55c88a6c78 100644 --- a/parachain/node/Cargo.toml +++ b/parachain/node/Cargo.toml @@ -7,7 +7,7 @@ homepage = 'https://litentry.com/' license = 'GPL-3.0' name = 'litentry-collator' repository = 'https://github.com/litentry/litentry-parachain' -version = '0.9.22' +version = '0.9.23' [[bin]] name = 'litentry-collator' diff --git a/parachain/node/src/command.rs b/parachain/node/src/command.rs index c6893c507b..ffbce6235e 100644 --- a/parachain/node/src/command.rs +++ b/parachain/node/src/command.rs @@ -35,33 +35,16 @@ use std::net::SocketAddr; const UNSUPPORTED_CHAIN_MESSAGE: &str = "Unsupported chain spec, please use litentry*"; trait IdentifyChain { - fn is_litentry(&self) -> bool; - fn is_paseo(&self) -> bool; fn is_standalone(&self) -> bool; } impl IdentifyChain for dyn sc_service::ChainSpec { - fn is_litentry(&self) -> bool { - // we need the combined condition as the id in our paseo spec starts with `litentry-paseo` - // simply renaming `litentry-paseo` to `paseo` everywhere would have an impact on the - // existing litentry-paseo chain - self.id().starts_with("litentry") && !self.id().starts_with("litentry-paseo") - } - fn is_paseo(&self) -> bool { - self.id().starts_with("litentry-paseo") - } fn is_standalone(&self) -> bool { self.id().eq("standalone") || self.id().eq("dev") } } impl IdentifyChain for T { - fn is_litentry(&self) -> bool { - ::is_litentry(self) - } - fn is_paseo(&self) -> bool { - ::is_paseo(self) - } fn is_standalone(&self) -> bool { ::is_standalone(self) } @@ -89,12 +72,7 @@ fn load_spec(id: &str) -> std::result::Result, St "generate-paseo" => Box::new(chain_specs::paseo::get_chain_spec_prod()), path => { let chain_spec = chain_specs::ChainSpec::from_json_file(path.into())?; - if chain_spec.is_paseo() { - Box::new(chain_specs::ChainSpec::from_json_file(path.into())?) - } else { - // Fallback: use Litentry chain spec - Box::new(chain_spec) - } + Box::new(chain_spec) }, }) } @@ -170,14 +148,11 @@ impl SubstrateCli for RelayChainCli { /// Creates partial components for the runtimes that are supported by the benchmarks. macro_rules! construct_benchmark_partials { ($config:expr, |$partials:ident| $code:expr) => { - if $config.chain_spec.is_litentry() { - let $partials = new_partial::<_>(&$config, build_import_queue, false, true)?; - $code - } else if $config.chain_spec.is_paseo() { + if $config.chain_spec.is_standalone() { + panic!("{}", UNSUPPORTED_CHAIN_MESSAGE) + } else { let $partials = new_partial::<_>(&$config, build_import_queue, false, true)?; $code - } else { - panic!("{}", UNSUPPORTED_CHAIN_MESSAGE) } }; } @@ -186,20 +161,9 @@ macro_rules! construct_async_run { (|$components:ident, $cli:ident, $cmd:ident, $config:ident| $( $code:tt )* ) => {{ let runner = $cli.create_runner($cmd)?; - if runner.config().chain_spec.is_litentry() { - runner.async_run(|$config| { - let $components = new_partial::< - _ - >( - &$config, - build_import_queue, - false, - $cli.delayed_best_block, - )?; - let task_manager = $components.task_manager; - { $( $code )* }.map(|v| (v, task_manager)) - }) - } else if runner.config().chain_spec.is_paseo() { + if runner.config().chain_spec.is_standalone() { + panic!("{}", UNSUPPORTED_CHAIN_MESSAGE) + } else { runner.async_run(|$config| { let $components = new_partial::< _ @@ -213,9 +177,6 @@ macro_rules! construct_async_run { { $( $code )* }.map(|v| (v, task_manager)) }) } - else { - panic!("{}", UNSUPPORTED_CHAIN_MESSAGE) - } }} } @@ -272,17 +233,9 @@ pub fn run() -> Result<()> { Some(Subcommand::ExportGenesisHead(cmd)) => { let runner = cli.create_runner(cmd)?; - if runner.config().chain_spec.is_litentry() { - runner.sync_run(|config| { - let sc_service::PartialComponents { client, .. } = new_partial::<_>( - &config, - build_import_queue, - false, - cli.delayed_best_block, - )?; - cmd.run(client) - }) - } else if runner.config().chain_spec.is_paseo() { + if runner.config().chain_spec.is_standalone() { + panic!("{}", UNSUPPORTED_CHAIN_MESSAGE) + } else { runner.sync_run(|config| { let sc_service::PartialComponents { client, .. } = new_partial::<_>( &config, @@ -292,8 +245,6 @@ pub fn run() -> Result<()> { )?; cmd.run(client) }) - } else { - panic!("{}", UNSUPPORTED_CHAIN_MESSAGE) } }, Some(Subcommand::ExportGenesisWasm(cmd)) => { @@ -411,20 +362,9 @@ pub fn run() -> Result<()> { let additional_config = AdditionalConfig { evm_tracing_config, enable_evm_rpc: cli.enable_evm_rpc }; - if config.chain_spec.is_litentry() { - start_node( - config, - polkadot_config, - collator_options, - para_id, - hwbench, - additional_config, - cli.delayed_best_block, - ) - .await - .map(|r| r.0) - .map_err(Into::into) - } else if config.chain_spec.is_paseo() { + if config.chain_spec.is_standalone() { + Err(UNSUPPORTED_CHAIN_MESSAGE.into()) + } else { start_node( config, polkadot_config, @@ -437,8 +377,6 @@ pub fn run() -> Result<()> { .await .map(|r| r.0) .map_err(Into::into) - } else { - Err(UNSUPPORTED_CHAIN_MESSAGE.into()) } }) },