Automatic pallet parts in construct_runtime

bin/node/runtime/src/lib.rs

@@ -1189,46 +1189,46 @@ construct_runtime!(
 		NodeBlock = node_primitives::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>},
-		Utility: pallet_utility::{Pallet, Call, Event},
-		Babe: pallet_babe::{Pallet, Call, Storage, Config, ValidateUnsigned},
-		Timestamp: pallet_timestamp::{Pallet, Call, Storage, Inherent},
-		Authorship: pallet_authorship::{Pallet, Call, Storage, Inherent},
-		Indices: pallet_indices::{Pallet, Call, Storage, Config<T>, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
-		TransactionPayment: pallet_transaction_payment::{Pallet, Storage},
-		ElectionProviderMultiPhase: pallet_election_provider_multi_phase::{Pallet, Call, Storage, Event<T>, ValidateUnsigned},
-		Staking: pallet_staking::{Pallet, Call, Config<T>, Storage, Event<T>},
+		System: frame_system,
+		Utility: pallet_utility,
+		Babe: pallet_babe,
+		Timestamp: pallet_timestamp,
+		Authorship: pallet_authorship,
+		Indices: pallet_indices,
+		Balances: pallet_balances,
+		TransactionPayment: pallet_transaction_payment,
+		ElectionProviderMultiPhase: pallet_election_provider_multi_phase,
+		Staking: pallet_staking,
 		Session: pallet_session::{Pallet, Call, Storage, Event, Config<T>},
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Democracy: pallet_democracy,
 		Council: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
 		TechnicalCommittee: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
-		Elections: pallet_elections_phragmen::{Pallet, Call, Storage, Event<T>, Config<T>},
+		Elections: pallet_elections_phragmen,
 		TechnicalMembership: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>},
-		Grandpa: pallet_grandpa::{Pallet, Call, Storage, Config, Event, ValidateUnsigned},
-		Treasury: pallet_treasury::{Pallet, Call, Storage, Config, Event<T>},
-		Contracts: pallet_contracts::{Pallet, Call, Storage, Event<T>},
-		Sudo: pallet_sudo::{Pallet, Call, Config<T>, Storage, Event<T>},
-		ImOnline: pallet_im_online::{Pallet, Call, Storage, Event<T>, ValidateUnsigned, Config<T>},
-		AuthorityDiscovery: pallet_authority_discovery::{Pallet, Config},
-		Offences: pallet_offences::{Pallet, Storage, Event},
+		Grandpa: pallet_grandpa,
+		Treasury: pallet_treasury,
+		Contracts: pallet_contracts,
+		Sudo: pallet_sudo,
+		ImOnline: pallet_im_online,
+		AuthorityDiscovery: pallet_authority_discovery,
+		Offences: pallet_offences,
 		Historical: pallet_session_historical::{Pallet},
-		RandomnessCollectiveFlip: pallet_randomness_collective_flip::{Pallet, Storage},
-		Identity: pallet_identity::{Pallet, Call, Storage, Event<T>},
+		RandomnessCollectiveFlip: pallet_randomness_collective_flip,
+		Identity: pallet_identity,
 		Society: pallet_society::{Pallet, Call, Storage, Event<T>, Config<T>},
-		Recovery: pallet_recovery::{Pallet, Call, Storage, Event<T>},
-		Vesting: pallet_vesting::{Pallet, Call, Storage, Event<T>, Config<T>},
-		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
-		Proxy: pallet_proxy::{Pallet, Call, Storage, Event<T>},
-		Multisig: pallet_multisig::{Pallet, Call, Storage, Event<T>},
+		Recovery: pallet_recovery,
+		Vesting: pallet_vesting,
+		Scheduler: pallet_scheduler,
+		Proxy: pallet_proxy,
+		Multisig: pallet_multisig,
 		Bounties: pallet_bounties::{Pallet, Call, Storage, Event<T>},
 		Tips: pallet_tips::{Pallet, Call, Storage, Event<T>},
-		Assets: pallet_assets::{Pallet, Call, Storage, Event<T>},
+		Assets: pallet_assets,
 		Mmr: pallet_mmr::{Pallet, Storage},
-		Lottery: pallet_lottery::{Pallet, Call, Storage, Event<T>},
-		Gilt: pallet_gilt::{Pallet, Call, Storage, Event<T>, Config},
-		Uniques: pallet_uniques::{Pallet, Call, Storage, Event<T>},
-		TransactionStorage: pallet_transaction_storage::{Pallet, Call, Storage, Inherent, Config<T>, Event<T>},
+		Lottery: pallet_lottery,
+		Gilt: pallet_gilt,
+		Uniques: pallet_uniques,
+		TransactionStorage: pallet_transaction_storage,
 	}
 );
 

frame/support/procedural/src/construct_runtime/mod.rs

@@ -19,111 +19,68 @@ mod expand;
 mod parse;
 
 use frame_support_procedural_tools::{
-	generate_crate_access, generate_hidden_includes, syn_ext as ext,
+	generate_crate_access, generate_crate_access_2018, generate_hidden_includes,
+};
+use parse::{
+	ExplicitRuntimeDeclaration, ImplicitRuntimeDeclaration, Pallet, RuntimeDeclaration,
+	WhereSection,
 };
-use parse::{PalletDeclaration, PalletPart, PalletPath, RuntimeDefinition, WhereSection};
 use proc_macro::TokenStream;
 use proc_macro2::TokenStream as TokenStream2;
 use quote::quote;
-use std::collections::HashMap;
 use syn::{Ident, Result};
 
 /// The fixed name of the system pallet.
 const SYSTEM_PALLET_NAME: &str = "System";
 
-/// The complete definition of a pallet with the resulting fixed index.
-#[derive(Debug, Clone)]
-pub struct Pallet {
-	pub name: Ident,
-	pub index: u8,
-	pub path: PalletPath,
-	pub instance: Option<Ident>,
-	pub pallet_parts: Vec<PalletPart>,
-}
-
-impl Pallet {
-	/// Get resolved pallet parts
-	fn pallet_parts(&self) -> &[PalletPart] {
-		&self.pallet_parts
-	}
+pub fn construct_runtime(input: TokenStream) -> TokenStream {
+	let input_copy = input.clone();
+	let definition = syn::parse_macro_input!(input as RuntimeDeclaration);
 
-	/// Find matching parts
-	fn find_part(&self, name: &str) -> Option<&PalletPart> {
-		self.pallet_parts.iter().find(|part| part.name() == name)
-	}
+	let res = match definition {
+		RuntimeDeclaration::Implicit(implicit_def) =>
+			construct_runtime_intermediary_expansion(input_copy.into(), implicit_def),
+		RuntimeDeclaration::Explicit(explicit_decl) =>
+			construct_runtime_final_expansion(explicit_decl),
+	};
 
-	/// Return whether pallet contains part
-	fn exists_part(&self, name: &str) -> bool {
-		self.find_part(name).is_some()
-	}
+	res.unwrap_or_else(|e| e.to_compile_error()).into()
 }
 
-/// Convert from the parsed pallet to their final information.
-/// Assign index to each pallet using same rules as rust for fieldless enum.
-/// I.e. implicit are assigned number incrementedly from last explicit or 0.
-fn complete_pallets(decl: impl Iterator<Item = PalletDeclaration>) -> syn::Result<Vec<Pallet>> {
-	let mut indices = HashMap::new();
-	let mut last_index: Option<u8> = None;
-	let mut names = HashMap::new();
-
-	decl.map(|pallet| {
-		let final_index = match pallet.index {
-			Some(i) => i,
-			None => last_index.map_or(Some(0), |i| i.checked_add(1)).ok_or_else(|| {
-				let msg = "Pallet index doesn't fit into u8, index is 256";
-				syn::Error::new(pallet.name.span(), msg)
-			})?,
-		};
-
-		last_index = Some(final_index);
-
-		if let Some(used_pallet) = indices.insert(final_index, pallet.name.clone()) {
-			let msg = format!(
-				"Pallet indices are conflicting: Both pallets {} and {} are at index {}",
-				used_pallet, pallet.name, final_index,
-			);
-			let mut err = syn::Error::new(used_pallet.span(), &msg);
-			err.combine(syn::Error::new(pallet.name.span(), msg));
-			return Err(err)
-		}
-
-		if let Some(used_pallet) = names.insert(pallet.name.clone(), pallet.name.span()) {
-			let msg = "Two pallets with the same name!";
-
-			let mut err = syn::Error::new(used_pallet, &msg);
-			err.combine(syn::Error::new(pallet.name.span(), &msg));
-			return Err(err)
-		}
-
-		Ok(Pallet {
-			name: pallet.name,
-			index: final_index,
-			path: pallet.path,
-			instance: pallet.instance,
-			pallet_parts: pallet.pallet_parts,
-		})
-	})
-	.collect()
-}
+fn construct_runtime_intermediary_expansion(
+	input: TokenStream2,
+	definition: ImplicitRuntimeDeclaration,
+) -> Result<TokenStream2> {
+	let frame_support = generate_crate_access_2018("frame-support")?;
+	let mut expansion = quote::quote!(
+		#frame_support::construct_runtime! { #input }
+	);
+	for pallet in definition.pallets.iter().filter(|pallet| pallet.pallet_parts.is_none()) {
+		let pallet_path = &pallet.path;
+		let pallet_name = &pallet.name;
+		let pallet_instance = pallet.instance.as_ref().map(|instance| quote::quote!(::<#instance>));
+		expansion = quote::quote!(
+			#pallet_path::construct_runtime_parts! {
+				{ #frame_support }
+				{ #pallet_name: #pallet_path #pallet_instance }
+				#expansion
+			}
+		);
+	}
 
-pub fn construct_runtime(input: TokenStream) -> TokenStream {
-	let definition = syn::parse_macro_input!(input as RuntimeDefinition);
-	construct_runtime_parsed(definition)
-		.unwrap_or_else(|e| e.to_compile_error())
-		.into()
+	Ok(expansion.into())
 }
 
-fn construct_runtime_parsed(definition: RuntimeDefinition) -> Result<TokenStream2> {
-	let RuntimeDefinition {
+fn construct_runtime_final_expansion(
+	definition: ExplicitRuntimeDeclaration,
+) -> Result<TokenStream2> {
+	let ExplicitRuntimeDeclaration {
 		name,
-		where_section: WhereSection { block, node_block, unchecked_extrinsic, .. },
-		pallets:
-			ext::Braces { content: ext::Punctuated { inner: pallets, .. }, token: pallets_token },
-		..
+		where_section: WhereSection { block, node_block, unchecked_extrinsic },
+		pallets,
+		pallets_token,
 	} = definition;
 
-	let pallets = complete_pallets(pallets.into_iter())?;
-
 	let hidden_crate_name = "construct_runtime";
 	let scrate = generate_crate_access(&hidden_crate_name, "frame-support");
 	let scrate_decl = generate_hidden_includes(&hidden_crate_name, "frame-support");