Companion for Substrate#14511

paritytech/substrate#14511
paritytech · Jul 4, 2023 · 5c44206 · 5c44206
1 parent bb9ddd7
commit 5c44206
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 47 deletions.
diff --git a/cli/src/command.rs b/cli/src/command.rs
@@ -18,7 +18,7 @@ use crate::cli::{Cli, Subcommand};
 use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFERENCE_HARDWARE};
 use futures::future::TryFutureExt;
 use log::info;
-use sc_cli::{RuntimeVersion, SubstrateCli};
+use sc_cli::SubstrateCli;
 use service::{
 	self,
 	benchmarking::{benchmark_inherent_data, RemarkBuilder, TransferKeepAliveBuilder},
@@ -168,38 +168,6 @@ impl SubstrateCli for Cli {
 			},
 		})
 	}
-
-	fn native_runtime_version(spec: &Box<dyn service::ChainSpec>) -> &'static RuntimeVersion {
-		#[cfg(feature = "kusama-native")]
-		if spec.is_kusama() {
-			return &service::kusama_runtime::VERSION
-		}
-
-		#[cfg(feature = "westend-native")]
-		if spec.is_westend() {
-			return &service::westend_runtime::VERSION
-		}
-
-		#[cfg(feature = "rococo-native")]
-		if spec.is_rococo() || spec.is_wococo() || spec.is_versi() {
-			return &service::rococo_runtime::VERSION
-		}
-
-		#[cfg(not(all(
-			feature = "rococo-native",
-			feature = "westend-native",
-			feature = "kusama-native"
-		)))]
-		let _ = spec;
-
-		#[cfg(feature = "polkadot-native")]
-		{
-			return &service::polkadot_runtime::VERSION
-		}
-
-		#[cfg(not(feature = "polkadot-native"))]
-		panic!("No runtime feature (polkadot, kusama, westend, rococo) is enabled")
-	}
 }
 
 fn set_default_ss58_version(spec: &Box<dyn service::ChainSpec>) {

diff --git a/parachain/test-parachains/adder/collator/src/cli.rs b/parachain/test-parachains/adder/collator/src/cli.rs
@@ -17,7 +17,7 @@
 //! Polkadot CLI library.
 
 use clap::Parser;
-use sc_cli::{RuntimeVersion, SubstrateCli};
+use sc_cli::SubstrateCli;
 
 /// Sub-commands supported by the collator.
 #[derive(Debug, Parser)]
@@ -105,10 +105,4 @@ impl SubstrateCli for Cli {
 			},
 		})
 	}
-
-	fn native_runtime_version(
-		_spec: &Box<dyn polkadot_service::ChainSpec>,
-	) -> &'static RuntimeVersion {
-		&polkadot_service::rococo_runtime::VERSION
-	}
 }
diff --git a/parachain/test-parachains/undying/collator/src/cli.rs b/parachain/test-parachains/undying/collator/src/cli.rs
@@ -17,7 +17,7 @@
 //! Polkadot CLI library.
 
 use clap::Parser;
-use sc_cli::{RuntimeVersion, SubstrateCli};
+use sc_cli::SubstrateCli;
 
 /// Sub-commands supported by the collator.
 #[derive(Debug, Parser)]
@@ -127,10 +127,4 @@ impl SubstrateCli for Cli {
 			},
 		})
 	}
-
-	fn native_runtime_version(
-		_spec: &Box<dyn polkadot_service::ChainSpec>,
-	) -> &'static RuntimeVersion {
-		&polkadot_service::rococo_runtime::VERSION
-	}
 }