From 9029637fc63d3fc2afb8841d0d8ee4a4e7b7c413 Mon Sep 17 00:00:00 2001
From: Daniel Shiposha <dshiposha@usetech.com>
Date: Tue, 15 Mar 2022 14:35:27 +0000
Subject: [PATCH] Fix autoseal, remove obsolete testnet specs


---
--- a/node/cli/src/chain_spec.rs
+++ b/node/cli/src/chain_spec.rs
@@ -216,59 +216,6 @@
 	)
 }
 
-pub fn local_testnet_westend_config() -> OpalChainSpec {
-	OpalChainSpec::from_genesis(
-		// Name
-		"Local Testnet",
-		// ID
-		"local_testnet",
-		ChainType::Local,
-		move || {
-			testnet_genesis(
-				// Sudo account
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				vec![
-					get_from_seed::<AuraId>("Alice"),
-					get_from_seed::<AuraId>("Bob"),
-					get_from_seed::<AuraId>("Charlie"),
-					get_from_seed::<AuraId>("Dave"),
-					get_from_seed::<AuraId>("Eve"),
-				],
-				// Pre-funded accounts
-				vec![
-					get_account_id_from_seed::<sr25519::Public>("Alice"),
-					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie"),
-					get_account_id_from_seed::<sr25519::Public>("Dave"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie"),
-					get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-					get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-				],
-				1000.into(),
-			)
-		},
-		// Bootnodes
-		vec![],
-		// Telemetry
-		None,
-		// Protocol ID
-		None,
-		None,
-		// Properties
-		None,
-		// Extensions
-		Extensions {
-			relay_chain: "westend-local".into(),
-			para_id: 1000,
-		},
-	)
-}
-
 fn testnet_genesis(
 	root_key: AccountId,
 	initial_authorities: Vec<AuraId>,
--- a/node/cli/src/command.rs
+++ b/node/cli/src/command.rs
@@ -75,8 +75,6 @@
 
 fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 	Ok(match id {
-		"westend-local" => Box::new(chain_spec::local_testnet_westend_config()),
-		"rococo-local" => Box::new(chain_spec::local_testnet_rococo_config()),
 		"dev" => Box::new(chain_spec::development_config()),
 		"" | "local" => Box::new(chain_spec::local_testnet_rococo_config()),
 		path => {
@@ -402,6 +400,8 @@
 					|| relay_chain_id == Some("dev-service".into());
 
 				if is_dev_service {
+					info!("Running Dev service");
+
 					return start_node_using_chain_runtime! {
 						start_dev_node(config).map_err(Into::into)
 					};
--- a/node/cli/src/service.rs
+++ b/node/cli/src/service.rs
@@ -126,7 +126,6 @@
 	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
-type MaybeSelectChain = Option<FullSelectChain>;
 
 /// Starts a `ServiceBuilder` for a full service.
 ///
@@ -141,7 +140,7 @@
 	PartialComponents<
 		FullClient<RuntimeApi, ExecutorDispatch>,
 		FullBackend,
-		MaybeSelectChain,
+		FullSelectChain,
 		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
 		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
 		(
@@ -218,10 +217,7 @@
 		telemetry
 	});
 
-	let select_chain = match service_id {
-		ServiceId::Prod => Some(sc_consensus::LongestChain::new(backend.clone())),
-		ServiceId::Dev => None,
-	};
+	let select_chain = sc_consensus::LongestChain::new(backend.clone());
 
 	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
 		config.transaction_pool.clone(),
@@ -367,7 +363,6 @@
 	let rpc_pool = transaction_pool.clone();
 	let select_chain = params
 		.select_chain
-		.expect("select_chain always exists when running Prod service; qed")
 		.clone();
 	let rpc_network = network.clone();
 
@@ -754,11 +749,7 @@
 	let prometheus_registry = config.prometheus_registry().cloned();
 	let collator = config.role.is_authority();
 
-	let select_chain = maybe_select_chain.clone().expect(
-		"`new_partial` builds a `LongestChainRule` when building dev service.\
-			We specified the dev service when calling `new_partial`.\
-			Therefore, a `LongestChainRule` is present. qed.",
-	);
+	let select_chain = maybe_select_chain.clone();
 
 	if collator {
 		let block_import =

-- 
gitstuff