diff --git a/Cargo.lock b/Cargo.lock index be498e906c8..b9c8af1e0b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1961,12 +1961,10 @@ dependencies = [ "cumulus-relay-chain-interface", "futures", "futures-timer", - "polkadot-cli", "polkadot-client", "polkadot-primitives", "polkadot-service", "polkadot-test-client", - "sc-cli", "sc-client-api", "sc-sysinfo", "sc-telemetry", diff --git a/client/relay-chain-inprocess-interface/Cargo.toml b/client/relay-chain-inprocess-interface/Cargo.toml index e2c38c87de7..97f437e193e 100644 --- a/client/relay-chain-inprocess-interface/Cargo.toml +++ b/client/relay-chain-inprocess-interface/Cargo.toml @@ -10,7 +10,6 @@ futures = "0.3.24" futures-timer = "3.0.2" # Substrate -sc-cli = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-client-api = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-telemetry = { git = "https://github.com/paritytech/substrate", branch = "master" } sc-tracing = { git = "https://github.com/paritytech/substrate", branch = "master" } @@ -22,7 +21,6 @@ sp-runtime = { git = "https://github.com/paritytech/substrate", branch = "master sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" } # Polkadot -polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "master", default-features = false, features = ["cli"] } polkadot-client = { git = "https://github.com/paritytech/polkadot", branch = "master" } polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" } diff --git a/client/relay-chain-inprocess-interface/src/lib.rs b/client/relay-chain-inprocess-interface/src/lib.rs index d713ab9cf38..f3659afb88a 100644 --- a/client/relay-chain-inprocess-interface/src/lib.rs +++ b/client/relay-chain-inprocess-interface/src/lib.rs @@ -31,7 +31,6 @@ use polkadot_client::{ClientHandle, ExecuteWithClient, FullBackend}; use polkadot_service::{ AuxStore, BabeApi, CollatorPair, Configuration, Handle, NewFull, TaskManager, }; -use sc_cli::SubstrateCli; use sc_client_api::{ blockchain::BlockStatus, Backend, BlockchainEvents, HeaderBackend, ImportNotifications, StorageProof, UsageProvider, @@ -361,11 +360,6 @@ pub fn build_inprocess_relay_chain( task_manager: &mut TaskManager, hwbench: Option, ) -> RelayChainResult<(Arc<(dyn RelayChainInterface + 'static)>, Option)> { - // This is essentially a hack, but we want to ensure that we send the correct node version - // to the telemetry. - polkadot_config.impl_version = polkadot_cli::Cli::impl_version(); - polkadot_config.impl_name = polkadot_cli::Cli::impl_name(); - let (full_node, collator_key) = build_polkadot_full_node( polkadot_config, parachain_config, diff --git a/polkadot-parachain/src/command.rs b/polkadot-parachain/src/command.rs index 0c3fbe67026..d438babb8d6 100644 --- a/polkadot-parachain/src/command.rs +++ b/polkadot-parachain/src/command.rs @@ -311,7 +311,7 @@ impl SubstrateCli for Cli { impl SubstrateCli for RelayChainCli { fn impl_name() -> String { - "Polkadot parachain".into() + "Parity Polkadot".into() } fn impl_version() -> String {