Companion of paritytech/substrate#10080, !

Author: aurexav

node/service/src/chain_spec/pangolin.rs

@@ -114,7 +114,6 @@ pub fn genesis_config() -> ChainSpec {
 		GenesisConfig {
 			system: SystemConfig {
 				code: wasm_binary_unwrap().to_vec(),
-				changes_trie_config: Default::default(),
 			},
 			babe: BabeConfig {
 				authorities: vec![],
@@ -356,7 +355,6 @@ pub fn development_config() -> ChainSpec {
 		GenesisConfig {
 			system: SystemConfig {
 				code: wasm_binary_unwrap().to_vec(),
-				changes_trie_config: Default::default(),
 			},
 			babe: BabeConfig {
 				authorities: vec![],
@@ -549,7 +547,6 @@ pub fn local_testnet_config() -> ChainSpec {
 		GenesisConfig {
 			system: SystemConfig {
 				code: wasm_binary_unwrap().to_vec(),
-				changes_trie_config: Default::default(),
 			},
 			babe: BabeConfig {
 				authorities: vec![],

node/service/src/chain_spec/pangoro.rs

@@ -103,10 +103,7 @@ pub fn genesis_config() -> ChainSpec {
 		};
 
 		GenesisConfig {
-			system: SystemConfig {
-				code: wasm_binary_unwrap().to_vec(),
-				changes_trie_config: Default::default(),
-			},
+			system: SystemConfig { code: wasm_binary_unwrap().to_vec() },
 			babe: BabeConfig { authorities: vec![], epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG) },
 			balances: BalancesConfig {
 				balances: vec![
@@ -256,10 +253,7 @@ pub fn development_config() -> ChainSpec {
 		};
 
 		GenesisConfig {
-			system: SystemConfig {
-				code: wasm_binary_unwrap().to_vec(),
-				changes_trie_config: Default::default(),
-			},
+			system: SystemConfig { code: wasm_binary_unwrap().to_vec() },
 			babe: BabeConfig { authorities: vec![], epoch_config: Some(BABE_GENESIS_EPOCH_CONFIG) },
 			balances: BalancesConfig {
 				balances: endowed_accounts.clone().into_iter().map(|a| (a, MANY_COINS)).collect(),

node/service/src/chain_spec/template.rs

@@ -42,10 +42,7 @@ pub fn development_config() -> ChainSpec {
 		];
 
 		GenesisConfig {
-			system: SystemConfig {
-				code: wasm_binary_unwrap().to_vec(),
-				changes_trie_config: Default::default(),
-			},
+			system: SystemConfig { code: wasm_binary_unwrap().to_vec() },
 			balances: BalancesConfig {
 				balances: endowed_accounts.iter().cloned().map(|k| (k, 1 << 60)).collect(),
 			},

node/service/src/service/mod.rs

@@ -187,7 +187,6 @@ where
 			transaction_pool: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
 			import_queue,
-			on_demand: None,
 			block_announce_validator_builder: None,
 			warp_sync: Some(warp_sync),
 		})?;
@@ -296,8 +295,6 @@ where
 		rpc_extensions_builder,
 		transaction_pool: transaction_pool.clone(),
 		task_manager: &mut task_manager,
-		on_demand: None,
-		remote_blockchain: None,
 		system_rpc_tx,
 		telemetry: telemetry.as_mut(),
 	})?;

node/service/src/service/template.rs

@@ -167,7 +167,6 @@ pub fn new_full(
 			transaction_pool: transaction_pool.clone(),
 			spawn_handle: task_manager.spawn_handle(),
 			import_queue,
-			on_demand: None,
 			block_announce_validator_builder: None,
 			warp_sync: None,
 		})?;
@@ -243,8 +242,6 @@ pub fn new_full(
 		task_manager: &mut task_manager,
 		transaction_pool: transaction_pool.clone(),
 		rpc_extensions_builder,
-		on_demand: None,
-		remote_blockchain: None,
 		backend: backend.clone(),
 		system_rpc_tx,
 		config,