frame/support: Remove GetRuntimeOuterEnumTypes marker trait

Signed-off-by: Alexandru Vasile <[email protected]>

frame/support/Cargo.toml

@@ -16,7 +16,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 serde = { version = "1.0.136", optional = true, features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false, features = ["derive", "max-encoded-len"] }
 scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-frame-metadata = { git = "https://github.com/paritytech/frame-metadata.git", branch = "lexnv/metadata_outer_enums", default-features = false, features = ["v14", "v15-unstable"] }
+frame-metadata = { git = "https://github.com/paritytech/frame-metadata.git", default-features = false, features = ["v14", "v15-unstable"] }
 sp-api = { version = "4.0.0-dev", default-features = false, path = "../../primitives/api" }
 sp-std = { version = "5.0.0", default-features = false, path = "../../primitives/std" }
 sp-io = { version = "7.0.0", default-features = false, path = "../../primitives/io" }

frame/support/procedural/src/construct_runtime/expand/metadata.rs

@@ -15,7 +15,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License
 
-use crate::construct_runtime::Pallet;
+use crate::construct_runtime::{parse::PalletPath, Pallet};
 use proc_macro2::TokenStream;
 use quote::quote;
 use std::str::FromStr;
@@ -26,6 +26,7 @@ pub fn expand_runtime_metadata(
 	pallet_declarations: &[Pallet],
 	scrate: &TokenStream,
 	extrinsic: &TypePath,
+	system_path: &PalletPath,
 ) -> TokenStream {
 	let pallets = pallet_declarations
 		.iter()
@@ -116,14 +117,10 @@ pub fn expand_runtime_metadata(
 					ty: #scrate::scale_info::meta_type::<#runtime>(),
 					apis: (&rt).runtime_metadata(),
 					call_enum_ty: #scrate::scale_info::meta_type::<
-							<#runtime as #scrate::sp_runtime::traits::GetRuntimeOuterEnumTypes>::RuntimeCall
-						>(),
-					event_enum_ty: #scrate::scale_info::meta_type::<
-							<#runtime as #scrate::sp_runtime::traits::GetRuntimeOuterEnumTypes>::RuntimeEvent
-						>(),
-					error_enum_ty: #scrate::scale_info::meta_type::<
-							<#runtime as #scrate::sp_runtime::traits::GetRuntimeOuterEnumTypes>::RuntimeError
+							<#runtime as #system_path::Config>::RuntimeCall;
 						>(),
+					event_enum_ty: #scrate::scale_info::meta_type::<RuntimeEvent>(),
+					error_enum_ty: #scrate::scale_info::meta_type::<RuntimeError>(),
 				}
 			}
 

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

@@ -236,9 +236,6 @@ fn construct_runtime_final_expansion(
 		))
 	}
 
-	// The path to the `System` pallet.
-	let system_path = &system_pallet.path;
-
 	let features = pallets
 		.iter()
 		.filter_map(|decl| {
@@ -269,7 +266,13 @@ fn construct_runtime_final_expansion(
 	let pallet_to_index = decl_pallet_runtime_setup(&name, &pallets, &scrate);
 
 	let dispatch = expand::expand_outer_dispatch(&name, system_pallet, &pallets, &scrate);
-	let metadata = expand::expand_runtime_metadata(&name, &pallets, &scrate, &unchecked_extrinsic);
+	let metadata = expand::expand_runtime_metadata(
+		&name,
+		&pallets,
+		&scrate,
+		&unchecked_extrinsic,
+		&system_pallet.path,
+	);
 	let outer_config = expand::expand_outer_config(&name, &pallets, &scrate);
 	let inherent =
 		expand::expand_outer_inherent(&name, &block, &unchecked_extrinsic, &pallets, &scrate);
@@ -301,17 +304,6 @@ fn construct_runtime_final_expansion(
 		impl #scrate::sp_runtime::traits::GetRuntimeBlockType for #name {
 			type RuntimeBlock = #block;
 		}
-		// The outer enums are generated in this scope with the following names.
-		impl #scrate::sp_runtime::traits::GetRuntimeOuterEnumTypes for #name {
-			// The `RuntimeCall` must be defined for all runtimes.
-			type RuntimeCall = <#name as #system_path::Config>::RuntimeCall;
-			// The associated type `RuntimeEvent` is present in the `frame_system::Config` trait
-			// if and only if the `#[pallet::event]` is declared. However, fallback to our
-			// generated outer `RuntimeEvent` enum to ensure consistency with pallets that don't
-			// emit events.
-			type RuntimeEvent = RuntimeEvent;
-			type RuntimeError = RuntimeError;
-		}
 
 		// Each runtime must expose the `runtime_metadata()` to fetch the runtime API metadata.
 		// The function is implemented by calling `impl_runtime_apis!`.

primitives/api/src/lib.rs

@@ -92,8 +92,8 @@ pub use sp_runtime::StateVersion;
 pub use sp_runtime::{
 	generic::BlockId,
 	traits::{
-		Block as BlockT, GetNodeBlockType, GetRuntimeBlockType, GetRuntimeOuterEnumTypes,
-		Hash as HashT, HashFor, Header as HeaderT, NumberFor,
+		Block as BlockT, GetNodeBlockType, GetRuntimeBlockType, Hash as HashT, HashFor,
+		Header as HeaderT, NumberFor,
 	},
 	transaction_validity::TransactionValidity,
 	RuntimeString, TransactionOutcome,

primitives/metadata-ir/Cargo.toml

@@ -14,7 +14,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.2.2", default-features = false }
-frame-metadata = { git = "https://github.com/paritytech/frame-metadata.git", branch = "lexnv/metadata_outer_enums", default-features = false, features = ["v14", "v15-unstable"] }
+frame-metadata = { git = "https://github.com/paritytech/frame-metadata.git", default-features = false, features = ["v14", "v15-unstable"] }
 scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
 sp-std = { version = "5.0.0", default-features = false, path = "../std" }
 

primitives/runtime/src/traits.rs

@@ -1379,23 +1379,6 @@ pub trait GetNodeBlockType {
 	type NodeBlock: self::Block;
 }
 
-/// A marker trait for something that knows the type of the runtime's
-/// outer Call, Event and Error enums.
-///
-/// The `RuntimeCall` and `RuntimeEvent` are configurable via the system's
-/// pallet `Config` trait. While the `RuntimeError` is currently generated
-/// by the `construct_runtime` macro.
-///
-/// This trait is implemented by the `construct_runtime!` macro for all runtimes.
-pub trait GetRuntimeOuterEnumTypes: Sized {
-	/// The `RuntimeCall` outer enum.
-	type RuntimeCall: Codec + TypeInfo;
-	/// The `RuntimeEvent` outer enum.
-	type RuntimeEvent: Codec + TypeInfo;
-	/// The `RuntimeError` outer enum.
-	type RuntimeError: Codec + TypeInfo;
-}
-
 /// Provide validation for unsigned extrinsics.
 ///
 /// This trait provides two functions [`pre_dispatch`](Self::pre_dispatch) and