git.delta.rocks / unique-network / refs/commits / 9029637fc63d

--- 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)
 					};

126	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;126	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
127type FullBackend = sc_service::TFullBackend<Block>;127type FullBackend = sc_service::TFullBackend<Block>;
128type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;128type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
129type MaybeSelectChain = Option<FullSelectChain>;
130129
131/// Starts a `ServiceBuilder` for a full service.130/// Starts a `ServiceBuilder` for a full service.
132///131///
141	PartialComponents<140	PartialComponents<
142		FullClient<RuntimeApi, ExecutorDispatch>,141		FullClient<RuntimeApi, ExecutorDispatch>,
143		FullBackend,142		FullBackend,
144		MaybeSelectChain,143		FullSelectChain,
145		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,144		sc_consensus::DefaultImportQueue<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
146		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,145		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, ExecutorDispatch>>,
147		(146		(
218		telemetry217		telemetry
219	});218	});
220219
221	let select_chain = match service_id {220	let select_chain = sc_consensus::LongestChain::new(backend.clone());
222		ServiceId::Prod => Some(sc_consensus::LongestChain::new(backend.clone())),
223		ServiceId::Dev => None,
224	};
225221
226	let transaction_pool = sc_transaction_pool::BasicPool::new_full(222	let transaction_pool = sc_transaction_pool::BasicPool::new_full(
227		config.transaction_pool.clone(),223		config.transaction_pool.clone(),
367	let rpc_pool = transaction_pool.clone();363	let rpc_pool = transaction_pool.clone();
368	let select_chain = params364	let select_chain = params
369		.select_chain365		.select_chain
370		.expect("select_chain always exists when running Prod service; qed")
371		.clone();366		.clone();
372	let rpc_network = network.clone();367	let rpc_network = network.clone();
373368
754	let prometheus_registry = config.prometheus_registry().cloned();749	let prometheus_registry = config.prometheus_registry().cloned();
755	let collator = config.role.is_authority();750	let collator = config.role.is_authority();
756751
757	let select_chain = maybe_select_chain.clone().expect(752	let select_chain = maybe_select_chain.clone();
758		"`new_partial` builds a `LongestChainRule` when building dev service.\
759			We specified the dev service when calling `new_partial`.\
760			Therefore, a `LongestChainRule` is present. qed.",
761	);
762753
763	if collator {754	if collator {
764		let block_import =755		let block_import =