diff --git a/node/Cargo.toml b/node/Cargo.toml index 1d840cbb..76b1a130 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -32,10 +32,7 @@ cumulus-client-network = { git = "https://github.com/paritytech cumulus-client-service = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } cumulus-primitives-core = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } -cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } cumulus-relay-chain-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } -cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } -cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/cumulus.git", branch = "polkadot-v0.9.36" } # darwinia crab-runtime = { path = "../runtime/crab" } diff --git a/node/src/command.rs b/node/src/command.rs index acd4be45..6962f2c6 100644 --- a/node/src/command.rs +++ b/node/src/command.rs @@ -568,7 +568,7 @@ pub fn run() -> Result<()> { if config.role.is_authority() { "yes" } else { "no" } ); - if collator_options.relay_chain_rpc_url.is_some() && cli.relay_chain_args.len() > 0 { + if !collator_options.relay_chain_rpc_urls.is_empty() && cli.relay_chain_args.len() > 0 { log::warn!("Detected relay chain node arguments together with --relay-chain-rpc-url. This command starts a minimal Polkadot node that only uses a network-related subset of all relay chain CLI options."); } diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs index 7dbad4fc..8c9aa0ad 100644 --- a/node/src/service/mod.rs +++ b/node/src/service/mod.rs @@ -216,35 +216,6 @@ where }) } -async fn build_relay_chain_interface( - polkadot_config: sc_service::Configuration, - parachain_config: &sc_service::Configuration, - telemetry_worker_handle: Option, - task_manager: &mut sc_service::TaskManager, - collator_options: cumulus_client_cli::CollatorOptions, - hwbench: Option, -) -> cumulus_relay_chain_interface::RelayChainResult<( - Arc<(dyn 'static + cumulus_relay_chain_interface::RelayChainInterface)>, - Option, -)> { - match collator_options.relay_chain_rpc_url { - Some(relay_chain_url) => - cumulus_relay_chain_minimal_node::build_minimal_relay_chain_node( - polkadot_config, - task_manager, - relay_chain_url, - ) - .await, - None => cumulus_relay_chain_inprocess_interface::build_inprocess_relay_chain( - polkadot_config, - parachain_config, - telemetry_worker_handle, - task_manager, - hwbench, - ), - } -} - /// Start a node with the given parachain `Configuration` and relay chain `Configuration`. /// /// This is the actual implementation that is abstract over the executor and the runtime api.