GenesisBuild<T,I> deprecated. BuildGenesisConfig added. (#14306)

* frame::support: GenesisConfig types for Runtime enabled

* frame::support: macro generating GenesisBuild::build for RuntimeGenesisConfig

* frame: ambiguity BuildStorage vs GenesisBuild fixed

* fix

* RuntimeGenesisBuild added

* Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed"

This reverts commit 950f3d019d0e21c55a739c44cc19cdabd3ff0293.

* Revert "fix"

This reverts commit a2f76dd24e9a16cf9230d45825ed28787211118b.

* Revert "RuntimeGenesisBuild added"

This reverts commit 3c131b618138ced29c01ab8d15d8c6410c9e128b.

* Revert "Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed""

This reverts commit 2b1ecd467231eddec69f8d328039ba48a380da3d.

* Revert "Revert "fix""

This reverts commit fd7fa629adf579d83e30e6ae9fd162637fc45e30.

* Code review suggestions

* frame: BuildGenesisConfig added, BuildGenesis deprecated

* frame: some pallets updated with BuildGenesisConfig

* constuct_runtime: support for BuildGenesisConfig

* frame::support: genesis_build macro supports BuildGenesisConfig

* frame: BuildGenesisConfig added, BuildGenesis deprecated

* Cargo.lock update

* test-runtime: fixes

* Revert "fix"

This reverts commit a2f76dd24e9a16cf9230d45825ed28787211118b.

* Revert "frame: ambiguity BuildStorage vs GenesisBuild fixed"

This reverts commit 950f3d019d0e21c55a739c44cc19cdabd3ff0293.

* self review

* doc fixed

* ui tests fixed

* fmt

* tests fixed

* genesis_build macrto fixed for non-generic GenesisConfig

* BuildGenesisConfig constraints added

* warning fixed

* some duplication removed

* fmt

* fix

* doc tests fix

* doc fix

* cleanup: remove BuildModuleGenesisStorage

* self review comments

* fix

* Update frame/treasury/src/tests.rs

Co-authored-by: Sebastian Kunert <skunert49@gmail.com>

* Update frame/support/src/traits/hooks.rs

Co-authored-by: Sebastian Kunert <skunert49@gmail.com>

* doc fix: GenesisBuild exposed

* ".git/.scripts/commands/fmt/fmt.sh"

* frame: more serde(skip) + cleanup

* Update frame/support/src/traits/hooks.rs

Co-authored-by: Davide Galassi <davxy@datawok.net>

* frame: phantom fields moved to the end of structs

* chain-spec: Default::default cleanup

* test-runtime: phantom at the end

* merge master fixes

* fix

* fix

* fix

* fix

* fix (facepalm)

* Update frame/support/procedural/src/pallet/expand/genesis_build.rs

Co-authored-by: Bastian Köcher <git@kchr.de>

* fmt

* fix

* fix

---------

Co-authored-by: parity-processbot <>
Co-authored-by: Sebastian Kunert <skunert49@gmail.com>
Co-authored-by: Davide Galassi <davxy@datawok.net>
Co-authored-by: Bastian Köcher <git@kchr.de>

substrate/frame/support/procedural/src/construct_runtime/expand/config.rs

@@ -29,7 +29,7 @@ pub fn expand_outer_config(
 ) -> TokenStream {
 	let mut types = TokenStream::new();
 	let mut fields = TokenStream::new();
-	let mut build_storage_calls = TokenStream::new();
+	let mut genesis_build_calls = TokenStream::new();
 	let mut query_genesis_config_part_macros = Vec::new();
 
 	for decl in pallet_decls {
@@ -52,8 +52,8 @@ pub fn expand_outer_config(
 
 			types.extend(expand_config_types(attr, runtime, decl, &config, part_is_generic));
 			fields.extend(quote!(#attr pub #field_name: #config,));
-			build_storage_calls
-				.extend(expand_config_build_storage_call(scrate, attr, runtime, decl, field_name));
+			genesis_build_calls
+				.extend(expand_config_build_storage_call(scrate, &config, attr, field_name));
 			query_genesis_config_part_macros.push(quote! {
 				#path::__substrate_genesis_config_check::is_genesis_config_defined!(#pallet_name);
 				#[cfg(feature = "std")]
@@ -67,9 +67,7 @@ pub fn expand_outer_config(
 
 		#types
 
-		#[cfg(any(feature = "std", test))]
 		use #scrate::serde as __genesis_config_serde_import__;
-		#[cfg(any(feature = "std", test))]
 		#[derive(#scrate::serde::Serialize, #scrate::serde::Deserialize, Default)]
 		#[serde(rename_all = "camelCase")]
 		#[serde(deny_unknown_fields)]
@@ -88,13 +86,17 @@ pub fn expand_outer_config(
 				&self,
 				storage: &mut #scrate::sp_runtime::Storage,
 			) -> std::result::Result<(), String> {
-				#build_storage_calls
-
 				#scrate::BasicExternalities::execute_with_storage(storage, || {
-					<AllPalletsWithSystem as #scrate::traits::OnGenesis>::on_genesis();
-				});
+					<Self as #scrate::traits::BuildGenesisConfig>::build(&self);
+					Ok(())
+				})
+			}
+		}
 
-				Ok(())
+		impl #scrate::traits::BuildGenesisConfig for RuntimeGenesisConfig {
+			fn build(&self) {
+				#genesis_build_calls
+				<AllPalletsWithSystem as #scrate::traits::OnGenesis>::on_genesis();
 			}
 		}
 	}
@@ -112,17 +114,14 @@ fn expand_config_types(
 	match (decl.instance.as_ref(), part_is_generic) {
 		(Some(inst), true) => quote! {
 			#attr
-			#[cfg(any(feature = "std", test))]
 			pub type #config = #path::GenesisConfig<#runtime, #path::#inst>;
 		},
 		(None, true) => quote! {
 			#attr
-			#[cfg(any(feature = "std", test))]
 			pub type #config = #path::GenesisConfig<#runtime>;
 		},
 		(_, false) => quote! {
 			#attr
-			#[cfg(any(feature = "std", test))]
 			pub type #config = #path::GenesisConfig;
 		},
 	}
@@ -130,21 +129,12 @@ fn expand_config_types(
 
 fn expand_config_build_storage_call(
 	scrate: &TokenStream,
+	pallet_genesis_config: &Ident,
 	attr: &TokenStream,
-	runtime: &Ident,
-	decl: &Pallet,
 	field_name: &Ident,
 ) -> TokenStream {
-	let path = &decl.path;
-	let instance = if let Some(inst) = decl.instance.as_ref() {
-		quote!(#path::#inst)
-	} else {
-		quote!(#path::__InherentHiddenInstance)
-	};
-
 	quote! {
 		#attr
-		#scrate::sp_runtime::BuildModuleGenesisStorage::
-			<#runtime, #instance>::build_module_genesis_storage(&self.#field_name, storage)?;
+		<#pallet_genesis_config as #scrate::traits::BuildGenesisConfig>::build(&self.#field_name);
 	}
 }

substrate/frame/support/procedural/src/lib.rs

@@ -1651,8 +1651,7 @@ pub fn genesis_config(_: TokenStream, _: TokenStream) -> TokenStream {
 /// The macro will add the following attribute:
 /// * `#[cfg(feature = "std")]`
 ///
-/// The macro will implement `sp_runtime::BuildModuleGenesisStorage` using `()` as a second
-/// generic for non-instantiable pallets.
+/// The macro will implement `sp_runtime::BuildStorage`.
 #[proc_macro_attribute]
 pub fn genesis_build(_: TokenStream, _: TokenStream) -> TokenStream {
 	pallet_macro_stub()

substrate/frame/support/procedural/src/pallet/expand/genesis_build.rs

@@ -18,7 +18,7 @@
 use crate::pallet::Def;
 
 ///
-/// * implement the trait `sp_runtime::BuildModuleGenesisStorage`
+/// * implement the trait `sp_runtime::BuildStorage`
 pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
 	let genesis_config = if let Some(genesis_config) = &def.genesis_config {
 		genesis_config
@@ -28,34 +28,22 @@ pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
 	let genesis_build = def.genesis_build.as_ref().expect("Checked by def parser");
 
 	let frame_support = &def.frame_support;
-	let type_impl_gen = &def.type_impl_generics(genesis_build.attr_span);
-	let type_use_gen = &def.type_use_generics(genesis_build.attr_span);
-	let trait_use_gen = if def.config.has_instance {
-		quote::quote_spanned!(genesis_build.attr_span => T, I)
-	} else {
-		// `__InherentHiddenInstance` used by construct_runtime here is alias for `()`
-		quote::quote_spanned!(genesis_build.attr_span => T, ())
-	};
+	let type_impl_gen = &genesis_config.gen_kind.type_impl_gen(genesis_build.attr_span);
 	let gen_cfg_ident = &genesis_config.genesis_config;
-
-	let gen_cfg_use_gen = genesis_config.gen_kind.type_use_gen(genesis_build.attr_span);
+	let gen_cfg_use_gen = &genesis_config.gen_kind.type_use_gen(genesis_build.attr_span);
 
 	let where_clause = &genesis_build.where_clause;
 
 	quote::quote_spanned!(genesis_build.attr_span =>
 		#[cfg(feature = "std")]
-		impl<#type_impl_gen> #frame_support::sp_runtime::BuildModuleGenesisStorage<#trait_use_gen>
-			for #gen_cfg_ident<#gen_cfg_use_gen> #where_clause
-		{
-			fn build_module_genesis_storage(
-				&self,
-				storage: &mut #frame_support::sp_runtime::Storage,
-			) -> std::result::Result<(), std::string::String> {
-				#frame_support::BasicExternalities::execute_with_storage(storage, || {
-					<Self as #frame_support::traits::GenesisBuild<#type_use_gen>>::build(self);
-					Ok(())
-				})
+			impl<#type_impl_gen> #frame_support::sp_runtime::BuildStorage for #gen_cfg_ident<#gen_cfg_use_gen> #where_clause
+			{
+				fn assimilate_storage(&self, storage: &mut sp_runtime::Storage) -> std::result::Result<(), std::string::String> {
+					#frame_support::BasicExternalities::execute_with_storage(storage, || {
+						self.build();
+						Ok(())
+					})
+				}
 			}
-		}
 	)
 }

substrate/frame/support/procedural/src/pallet/parse/genesis_build.rs

@@ -23,7 +23,7 @@ pub struct GenesisBuildDef {
 	/// The index of item in pallet module.
 	pub index: usize,
 	/// A set of usage of instance, must be check for consistency with trait.
-	pub instances: Vec<helper::InstanceUsage>,
+	pub instances: Option<Vec<helper::InstanceUsage>>,
 	/// The where_clause used.
 	pub where_clause: Option<syn::WhereClause>,
 	/// The span of the pallet::genesis_build attribute.
@@ -53,7 +53,8 @@ impl GenesisBuildDef {
 			})?
 			.1;
 
-		let instances = vec![helper::check_genesis_builder_usage(item_trait)?];
+		let instances =
+			helper::check_genesis_builder_usage(item_trait)?.map(|instances| vec![instances]);
 
 		Ok(Self { attr_span, index, instances, where_clause: item.generics.where_clause.clone() })
 	}

substrate/frame/support/procedural/src/pallet/parse/helper.rs

@@ -23,6 +23,7 @@ mod keyword {
 	syn::custom_keyword!(I);
 	syn::custom_keyword!(compact);
 	syn::custom_keyword!(GenesisBuild);
+	syn::custom_keyword!(BuildGenesisConfig);
 	syn::custom_keyword!(Config);
 	syn::custom_keyword!(T);
 	syn::custom_keyword!(Pallet);
@@ -488,26 +489,32 @@ pub fn check_type_def_gen(
 /// Check the syntax:
 /// * either `GenesisBuild<T>`
 /// * or `GenesisBuild<T, I>`
+/// * or `BuildGenesisConfig`
 ///
-/// return the instance if found.
-pub fn check_genesis_builder_usage(type_: &syn::Path) -> syn::Result<InstanceUsage> {
+/// return the instance if found for `GenesisBuild`
+/// return None for BuildGenesisConfig
+pub fn check_genesis_builder_usage(type_: &syn::Path) -> syn::Result<Option<InstanceUsage>> {
 	let expected = "expected `GenesisBuild<T>` or `GenesisBuild<T, I>`";
-	pub struct Checker(InstanceUsage);
+	pub struct Checker(Option<InstanceUsage>);
 	impl syn::parse::Parse for Checker {
 		fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
 			let mut instance_usage = InstanceUsage { span: input.span(), has_instance: false };
 
-			input.parse::<keyword::GenesisBuild>()?;
-			input.parse::<syn::Token![<]>()?;
-			input.parse::<keyword::T>()?;
-			if input.peek(syn::Token![,]) {
-				instance_usage.has_instance = true;
-				input.parse::<syn::Token![,]>()?;
-				input.parse::<keyword::I>()?;
+			if input.peek(keyword::GenesisBuild) {
+				input.parse::<keyword::GenesisBuild>()?;
+				input.parse::<syn::Token![<]>()?;
+				input.parse::<keyword::T>()?;
+				if input.peek(syn::Token![,]) {
+					instance_usage.has_instance = true;
+					input.parse::<syn::Token![,]>()?;
+					input.parse::<keyword::I>()?;
+				}
+				input.parse::<syn::Token![>]>()?;
+				return Ok(Self(Some(instance_usage)))
+			} else {
+				input.parse::<keyword::BuildGenesisConfig>()?;
+				return Ok(Self(None))
 			}
-			input.parse::<syn::Token![>]>()?;
-
-			Ok(Self(instance_usage))
 		}
 	}
 

substrate/frame/support/procedural/src/pallet/parse/mod.rs

@@ -268,7 +268,7 @@ impl Def {
 			instances.extend_from_slice(&genesis_config.instances[..]);
 		}
 		if let Some(genesis_build) = &self.genesis_build {
-			instances.extend_from_slice(&genesis_build.instances[..]);
+			genesis_build.instances.as_ref().map(|i| instances.extend_from_slice(&i));
 		}
 		if let Some(extra_constants) = &self.extra_constants {
 			instances.extend_from_slice(&extra_constants.instances[..]);

substrate/frame/support/src/lib.rs

@@ -925,19 +925,25 @@ pub mod tests {
 		>;
 
 		#[pallet::genesis_config]
-		pub struct GenesisConfig {
+		pub struct GenesisConfig<T: Config> {
 			pub data: Vec<(u32, u64)>,
 			pub test_config: Vec<(u32, u32, u64)>,
+			#[serde(skip)]
+			pub _config: sp_std::marker::PhantomData<T>,
 		}
 
-		impl Default for GenesisConfig {
+		impl<T: Config> Default for GenesisConfig<T> {
 			fn default() -> Self {
-				Self { data: vec![(15u32, 42u64)], test_config: vec![(15u32, 16u32, 42u64)] }
+				Self {
+					_config: Default::default(),
+					data: vec![(15u32, 42u64)],
+					test_config: vec![(15u32, 16u32, 42u64)],
+				}
 			}
 		}
 
 		#[pallet::genesis_build]
-		impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 			fn build(&self) {
 				for (k, v) in &self.data {
 					<Data<T>>::insert(k, v);
@@ -1556,7 +1562,7 @@ pub mod pallet_prelude {
 			},
 		},
 		traits::{
-			ConstU32, EnsureOrigin, GenesisBuild, Get, GetDefault, GetStorageVersion, Hooks,
+			BuildGenesisConfig, ConstU32, EnsureOrigin, Get, GetDefault, GetStorageVersion, Hooks,
 			IsType, PalletInfoAccess, StorageInfoTrait, StorageVersion, TypedGet,
 		},
 		Blake2_128, Blake2_128Concat, Blake2_256, CloneNoBound, DebugNoBound, EqNoBound, Identity,
@@ -2231,7 +2237,7 @@ pub mod pallet_prelude {
 /// for the pallet.
 ///
 /// Item is defined as either an enum or a struct. It needs to be public and implement the
-/// trait [`GenesisBuild`](`traits::GenesisBuild`) with
+/// trait [`BuildGenesisConfig`](`traits::BuildGenesisConfig`) with
 /// [`#[pallet::genesis_build]`](#genesis-build-palletgenesis_build-optional). The type
 /// generics are constrained to be either none, or `T` or `T: Config`.
 ///
@@ -2513,14 +2519,15 @@ pub mod pallet_prelude {
 /// 	//
 /// 	// Type must implement the `Default` trait.
 /// 	#[pallet::genesis_config]
-/// 	#[derive(Default)]
-/// 	pub struct GenesisConfig {
+/// 	#[derive(frame_support::DefaultNoBound)]
+/// 	pub struct GenesisConfig<T: Config> {
+/// 	    _config: sp_std::marker::PhantomData<T>,
 /// 		_myfield: u32,
 /// 	}
 ///
 /// 	// Declare genesis builder. (This is need only if GenesisConfig is declared)
 /// 	#[pallet::genesis_build]
-/// 	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+/// 	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 /// 		fn build(&self) {}
 /// 	}
 ///
@@ -2650,13 +2657,14 @@ pub mod pallet_prelude {
 /// 		StorageMap<Hasher = Blake2_128Concat, Key = u32, Value = u32>;
 ///
 /// 	#[pallet::genesis_config]
-/// 	#[derive(Default)]
-/// 	pub struct GenesisConfig {
+/// 	#[derive(frame_support::DefaultNoBound)]
+/// 	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+/// 		 _config: sp_std::marker::PhantomData<(T,I)>,
 /// 		_myfield: u32,
 /// 	}
 ///
 /// 	#[pallet::genesis_build]
-/// 	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig {
+/// 	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
 /// 		fn build(&self) {}
 /// 	}
 ///

substrate/frame/support/src/traits.rs

@@ -80,8 +80,10 @@ pub use metadata::{
 };
 
 mod hooks;
+#[allow(deprecated)]
+pub use hooks::GenesisBuild;
 pub use hooks::{
-	GenesisBuild, Hooks, IntegrityTest, OnFinalize, OnGenesis, OnIdle, OnInitialize,
+	BuildGenesisConfig, Hooks, IntegrityTest, OnFinalize, OnGenesis, OnIdle, OnInitialize,
 	OnRuntimeUpgrade, OnTimestampSet,
 };
 

substrate/frame/support/src/traits/hooks.rs

@@ -359,8 +359,19 @@ pub trait Hooks<BlockNumber> {
 	fn integrity_test() {}
 }
 
+/// A trait to define the build function of a genesis config for both runtime and pallets.
+///
+/// Replaces deprecated [`GenesisBuild<T,I>`].
+pub trait BuildGenesisConfig: Default + sp_runtime::traits::MaybeSerializeDeserialize {
+	/// The build function puts initial `GenesisConfig` keys/values pairs into the storage.
+	fn build(&self);
+}
+
 /// A trait to define the build function of a genesis config, T and I are placeholder for pallet
 /// trait and pallet instance.
+#[deprecated(
+	note = "GenesisBuild is planned to be removed in December 2023. Use BuildGenesisConfig instead of it."
+)]
 pub trait GenesisBuild<T, I = ()>: Default + sp_runtime::traits::MaybeSerializeDeserialize {
 	/// The build function is called within an externalities allowing storage APIs.
 	/// Thus one can write to storage using regular pallet storages.

substrate/frame/support/test/pallet/Cargo.toml

@@ -17,6 +17,7 @@ scale-info = { version = "2.0.0", default-features = false, features = ["derive"
 serde = { version = "1.0.163", default-features = false, features = ["derive"] }
 frame-support = { version = "4.0.0-dev", default-features = false, path = "../../" }
 frame-system = { version = "4.0.0-dev", default-features = false, path = "../../../system" }
+sp-runtime = { version = "24.0.0", default-features = false, path = "../../../../primitives/runtime" }
 
 [features]
 default = ["std"]

substrate/frame/support/test/pallet/src/lib.rs

@@ -37,11 +37,14 @@ pub mod pallet {
 	pub type Value<T> = StorageValue<_, u32>;
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {}
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		_config: core::marker::PhantomData<T>,
+	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {}
 	}
 

substrate/frame/support/test/tests/common/outer_enums.rs

@@ -52,7 +52,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
 		fn build(&self) {}
 	}
 
@@ -96,7 +96,7 @@ pub mod pallet2 {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
 		fn build(&self) {}
 	}
 
@@ -140,7 +140,7 @@ pub mod pallet3 {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
 		fn build(&self) {}
 	}
 }

substrate/frame/support/test/tests/construct_runtime.rs

@@ -165,11 +165,14 @@ mod nested {
 		}
 
 		#[pallet::genesis_config]
-		#[derive(Default)]
-		pub struct GenesisConfig {}
+		#[derive(frame_support::DefaultNoBound)]
+		pub struct GenesisConfig<T: Config> {
+			#[serde(skip)]
+			pub _config: sp_std::marker::PhantomData<T>,
+		}
 
 		#[pallet::genesis_build]
-		impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 			fn build(&self) {}
 		}
 	}
@@ -234,11 +237,14 @@ pub mod module3 {
 	}
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {}
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
+	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {}
 	}
 }
@@ -262,8 +268,8 @@ frame_support::construct_runtime!(
 		Module1_1: module1::<Instance1>::{Pallet, Call, Storage, Event<T>, Origin<T>},
 		Module2: module2::{Pallet, Call, Storage, Event<T>, Origin},
 		Module1_2: module1::<Instance2>::{Pallet, Call, Storage, Event<T>, Origin<T>},
-		NestedModule3: nested::module3::{Pallet, Call, Config, Storage, Event<T>, Origin},
-		Module3: self::module3::{Pallet, Call, Config, Storage, Event<T>, Origin<T>},
+		NestedModule3: nested::module3::{Pallet, Call, Config<T>, Storage, Event<T>, Origin},
+		Module3: self::module3::{Pallet, Call, Config<T>, Storage, Event<T>, Origin<T>},
 		Module1_3: module1::<Instance3>::{Pallet, Storage, Event<T> } = 6,
 		Module1_4: module1::<Instance4>::{Pallet, Call, Event<T> } = 3,
 		Module1_5: module1::<Instance5>::{Pallet, Event<T>},

substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs

@@ -7,7 +7,7 @@ construct_runtime! {
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		#[cfg(test)]
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 	}
 }
 

substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr

@@ -1,5 +1,5 @@
 error: `System` pallet declaration is feature gated, please remove any `#[cfg]` attributes
   --> tests/construct_runtime_ui/feature_gated_system_pallet.rs:10:3
    |
-10 |         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+10 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
    |         ^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs

@@ -52,7 +52,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet1: pallet::{Pallet},
 		Pallet2: pallet::{Pallet},
 		Pallet3: pallet::{Pallet},

substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs

@@ -77,7 +77,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet: pallet::{Pallet},
 	}
 }

substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs

@@ -52,7 +52,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet: pallet::{Pallet, Call},
 	}
 }

substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs

@@ -52,7 +52,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system expanded::{}::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet: pallet expanded::{}::{Pallet, Event},
 	}
 }

substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs

@@ -52,7 +52,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system expanded::{}::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet: pallet expanded::{}::{Pallet, Config},
 	}
 }

substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs

@@ -52,7 +52,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system expanded::{}::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet: pallet expanded::{}::{Pallet, Inherent},
 	}
 }

substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs

@@ -52,7 +52,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system expanded::{}::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet: pallet expanded::{}::{Pallet, Origin},
 	}
 }

substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs

@@ -52,7 +52,7 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 		Pallet: pallet::{Pallet, ValidateUnsigned},
 	}
 }

substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr

@@ -23,7 +23,7 @@ error[E0599]: no variant or associated item named `Pallet` found for enum `Runti
 51 | ||         Block = Block,
 52 | ||         NodeBlock = Block,
 ...  ||
-55 | ||         System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
+55 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
 56 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
    | ||        -^^^^^^ variant or associated item not found in `RuntimeCall`
    | ||________|

substrate/frame/support/test/tests/final_keys.rs

@@ -90,7 +90,7 @@ mod no_instance {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			<Value<T>>::put(self.value);
 			<TestGenericValue<T>>::put(&self.test_generic_value);
@@ -169,7 +169,7 @@ mod instance {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
 		fn build(&self) {
 			<Value<T, I>>::put(self.value);
 			<TestGenericValue<T, I>>::put(&self.test_generic_value);

substrate/frame/support/test/tests/genesisconfig.rs

@@ -53,7 +53,7 @@ pub mod pallet {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T> {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			for (k1, k2, v) in &self.t {
 				<AppendableDM<T>>::insert(k1, k2, v);

substrate/frame/support/test/tests/instance.rs

@@ -87,7 +87,7 @@ mod module1 {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I>
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I>
 	where
 		T::BlockNumber: std::fmt::Display,
 	{
@@ -196,7 +196,7 @@ mod module2 {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I>
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I>
 	where
 		T::BlockNumber: std::fmt::Display,
 	{

substrate/frame/support/test/tests/issue2219.rs

@@ -134,14 +134,16 @@ mod module {
 	pub type RequestLifeTime<T: Config> = StorageValue<_, u64, ValueQuery, ConstU64<0>>;
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
 		pub enable_storage_role: bool,
 		pub request_life_time: u64,
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {
 			if self.enable_storage_role {
 				<Parameters<T>>::insert(Role::Storage, <RoleParameters<T>>::default());
@@ -187,7 +189,11 @@ frame_support::construct_runtime!(
 #[test]
 fn create_genesis_config() {
 	let config = RuntimeGenesisConfig {
-		module: module::GenesisConfig { request_life_time: 0, enable_storage_role: true },
+		module: module::GenesisConfig {
+			request_life_time: 0,
+			enable_storage_role: true,
+			..Default::default()
+		},
 	};
 	assert_eq!(config.module.request_life_time, 0);
 	assert!(config.module.enable_storage_role);

substrate/frame/support/test/tests/origin.rs

@@ -60,11 +60,14 @@ mod nested {
 		}
 
 		#[pallet::genesis_config]
-		#[derive(Default)]
-		pub struct GenesisConfig {}
+		#[derive(frame_support::DefaultNoBound)]
+		pub struct GenesisConfig<T: Config> {
+			#[serde(skip)]
+			pub _config: sp_std::marker::PhantomData<T>,
+		}
 
 		#[pallet::genesis_build]
-		impl<T: Config> GenesisBuild<T> for GenesisConfig {
+		impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 			fn build(&self) {}
 		}
 	}
@@ -128,11 +131,14 @@ pub mod module {
 	}
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {}
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		pub _config: sp_std::marker::PhantomData<T>,
+	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {}
 	}
 }

substrate/frame/support/test/tests/pallet.rs

@@ -402,13 +402,18 @@ pub mod pallet {
 	pub type Unbounded<T> = StorageValue<Value = Vec<u8>>;
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config>
+	where
+		T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType4>,
+	{
+		#[serde(skip)]
+		_config: sp_std::marker::PhantomData<T>,
 		_myfield: u32,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T>
 	where
 		T::AccountId: From<SomeType1> + SomeAssociation1 + From<SomeType4>,
 	{
@@ -586,7 +591,7 @@ pub mod pallet2 {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig<T>
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T>
 	where
 		T::AccountId: From<SomeType1> + SomeAssociation1,
 	{

substrate/frame/support/test/tests/pallet_instance.rs

@@ -185,13 +185,15 @@ pub mod pallet {
 	>;
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config<I>, I: 'static = ()> {
+		#[serde(skip)]
+		_config: sp_std::marker::PhantomData<(T, I)>,
 		_myfield: u32,
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig {
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
 		fn build(&self) {}
 	}
 
@@ -281,7 +283,7 @@ pub mod pallet2 {
 	}
 
 	#[pallet::genesis_build]
-	impl<T: Config<I>, I: 'static> GenesisBuild<T, I> for GenesisConfig<T, I> {
+	impl<T: Config<I>, I: 'static> BuildGenesisConfig for GenesisConfig<T, I> {
 		fn build(&self) {}
 	}
 }

substrate/frame/support/test/tests/pallet_outer_enums_explicit.rs

@@ -78,7 +78,7 @@ frame_support::construct_runtime!(
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
 		// Exclude part `Storage` in order not to check its metadata in tests.
-		System: frame_system::{Pallet, Config, Call, Event<T> },
+		System: frame_system::{Pallet, Config<T>, Call, Event<T> },
 
 		// This pallet exposes the Error type explicitly.
 		Example: common::outer_enums::pallet::{Pallet, Config<T>, Event<T>, Error<T>},

substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.rs

@@ -1,6 +1,6 @@
 #[frame_support::pallet]
 mod pallet {
-	use frame_support::pallet_prelude::{Hooks, GenesisBuild};
+	use frame_support::pallet_prelude::{BuildGenesisConfig, Hooks};
 	use frame_system::pallet_prelude::BlockNumberFor;
 
 	#[pallet::config]
@@ -19,7 +19,7 @@ mod pallet {
 	pub struct GenesisConfig;
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {}
+	impl BuildGenesisConfig for GenesisConfig {}
 }
 
 fn main() {

substrate/frame/support/test/tests/pallet_ui/genesis_default_not_satisfied.stderr

@@ -1,14 +1,14 @@
 error[E0277]: the trait bound `pallet::GenesisConfig: std::default::Default` is not satisfied
-  --> tests/pallet_ui/genesis_default_not_satisfied.rs:22:38
+  --> tests/pallet_ui/genesis_default_not_satisfied.rs:22:30
    |
-22 |     impl<T: Config> GenesisBuild<T> for GenesisConfig {}
-   |                                         ^^^^^^^^^^^^^ the trait `std::default::Default` is not implemented for `pallet::GenesisConfig`
+22 |     impl BuildGenesisConfig for GenesisConfig {}
+   |                                 ^^^^^^^^^^^^^ the trait `std::default::Default` is not implemented for `pallet::GenesisConfig`
    |
-note: required by a bound in `GenesisBuild`
+note: required by a bound in `BuildGenesisConfig`
   --> $WORKSPACE/frame/support/src/traits/hooks.rs
    |
-   | pub trait GenesisBuild<T, I = ()>: Default + sp_runtime::traits::MaybeSerializeDeserialize {
-   |                                    ^^^^^^^ required by this bound in `GenesisBuild`
+   | pub trait BuildGenesisConfig: Default + sp_runtime::traits::MaybeSerializeDeserialize {
+   |                               ^^^^^^^ required by this bound in `BuildGenesisConfig`
 help: consider annotating `pallet::GenesisConfig` with `#[derive(Default)]`
     |
 19  +     #[derive(Default)]

substrate/frame/support/test/tests/pallet_ui/pass/no_std_genesis_config.rs

@@ -43,8 +43,8 @@ construct_runtime! {
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic
 	{
-		System: frame_system::{Pallet, Call, Storage, Config, Event<T>},
-		Pallet: test_pallet::{Pallet, Config},
+		System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Pallet: test_pallet::{Pallet, Config<T>},
 	}
 }
 

substrate/frame/support/test/tests/versioned_runtime_upgrade.rs

@@ -27,6 +27,7 @@ use frame_support::{
 	weights::constants::RocksDbWeight,
 };
 use frame_system::Config;
+use sp_runtime::BuildStorage;
 
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Test>;
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -48,11 +49,14 @@ mod dummy_pallet {
 	pub type SomeStorage<T: Config> = StorageValue<_, u32, ValueQuery>;
 
 	#[pallet::genesis_config]
-	#[derive(Default)]
-	pub struct GenesisConfig {}
+	#[derive(frame_support::DefaultNoBound)]
+	pub struct GenesisConfig<T: Config> {
+		#[serde(skip)]
+		_config: sp_std::marker::PhantomData<T>,
+	}
 
 	#[pallet::genesis_build]
-	impl<T: Config> GenesisBuild<T> for GenesisConfig {
+	impl<T: Config> BuildGenesisConfig for GenesisConfig<T> {
 		fn build(&self) {}
 	}
 }
@@ -65,8 +69,8 @@ construct_runtime!(
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
-		System: frame_system::{Pallet, Call, Config, Storage, Event<T>} = 0,
-		DummyPallet: dummy_pallet::{Pallet, Config, Storage} = 1,
+		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 0,
+		DummyPallet: dummy_pallet::{Pallet, Config<T>, Storage} = 1,
 	}
 );
 
@@ -81,7 +85,7 @@ impl frame_system::Config for Test {
 }
 
 pub(crate) fn new_test_ext() -> sp_io::TestExternalities {
-	let storage = frame_system::GenesisConfig::default().build_storage::<Test>().unwrap();
+	let storage = frame_system::GenesisConfig::<Test>::default().build_storage().unwrap();
 	let mut ext: sp_io::TestExternalities = sp_io::TestExternalities::from(storage);
 	ext.execute_with(|| System::set_block_number(1));
 	ext