Pub enum runtime to pub struct runtime (paritytech#13250)

* pub enum Runtime -> pub struct Runtime * changing some more * fmt * updating *.stderr files * re-run trybuild after rust update * keep a test file for `pub enum Runtime` * Delete construct_runtime_2.rs * ".git/.scripts/commands/fmt/fmt.sh" --------- Co-authored-by: Bastian Köcher <git@kchr.de> Co-authored-by: parity-processbot <>
gear-tech · Apr 10, 2023 · a46dc41 · a46dc41
1 parent be303ce
commit a46dc41
Show file tree

Hide file tree

Showing 73 changed files with 99 additions and 96 deletions.
diff --git a/bin/node/runtime/src/lib.rs b/bin/node/runtime/src/lib.rs
@@ -1740,7 +1740,7 @@ impl frame_benchmarking_pallet_pov::Config for Runtime {
 }
 
 construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = node_primitives::Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/bags-list/src/mock.rs b/frame/bags-list/src/mock.rs
@@ -88,7 +88,7 @@ impl bags_list::Config for Runtime {
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,

diff --git a/frame/election-provider-multi-phase/src/mock.rs b/frame/election-provider-multi-phase/src/mock.rs
@@ -54,7 +54,7 @@ pub type UncheckedExtrinsic =
 	sp_runtime::generic::UncheckedExtrinsic<AccountId, RuntimeCall, (), ()>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/election-provider-support/src/onchain.rs b/frame/election-provider-support/src/onchain.rs
@@ -197,7 +197,7 @@ mod tests {
 	pub type Block = sp_runtime::generic::Block<Header, UncheckedExtrinsic>;
 
 	frame_support::construct_runtime!(
-		pub enum Runtime where
+		pub struct Runtime where
 			Block = Block,
 			NodeBlock = Block,
 			UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/executive/src/lib.rs b/frame/executive/src/lib.rs
@@ -838,7 +838,7 @@ mod tests {
 	}
 
 	frame_support::construct_runtime!(
-		pub enum Runtime where
+		pub struct Runtime where
 			Block = TestBlock,
 			NodeBlock = TestBlock,
 			UncheckedExtrinsic = TestUncheckedExtrinsic

diff --git a/frame/fast-unstake/src/mock.rs b/frame/fast-unstake/src/mock.rs
@@ -193,10 +193,11 @@ impl fast_unstake::Config for Runtime {
 type Block = frame_system::mocking::MockBlock<Runtime>;
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime
+	where
 		Block = Block,
 		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system,
 		Timestamp: pallet_timestamp,

diff --git a/frame/im-online/src/mock.rs b/frame/im-online/src/mock.rs
@@ -43,7 +43,7 @@ type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,

diff --git a/frame/nomination-pools/benchmarking/src/mock.rs b/frame/nomination-pools/benchmarking/src/mock.rs
@@ -173,7 +173,7 @@ impl crate::Config for Runtime {}
 type Block = frame_system::mocking::MockBlock<Runtime>;
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/nomination-pools/src/mock.rs b/frame/nomination-pools/src/mock.rs
@@ -236,7 +236,7 @@ impl pools::Config for Runtime {
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 type Block = frame_system::mocking::MockBlock<Runtime>;
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,

diff --git a/frame/nomination-pools/test-staking/src/mock.rs b/frame/nomination-pools/test-staking/src/mock.rs
@@ -186,7 +186,7 @@ type Block = frame_system::mocking::MockBlock<Runtime>;
 type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/offences/src/mock.rs b/frame/offences/src/mock.rs
@@ -70,7 +70,7 @@ type UncheckedExtrinsic = frame_system::mocking::MockUncheckedExtrinsic<Runtime>
 type Block = frame_system::mocking::MockBlock<Runtime>;
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic,

diff --git a/frame/support/test/compile_pass/src/lib.rs b/frame/support/test/compile_pass/src/lib.rs
@@ -85,10 +85,11 @@ pub type Block = generic::Block<Header, UncheckedExtrinsic>;
 pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
 
 construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime
+	where
 		Block = Block,
 		NodeBlock = Block,
-		UncheckedExtrinsic = UncheckedExtrinsic
+		UncheckedExtrinsic = UncheckedExtrinsic,
 	{
 		System: frame_system,
 	}

diff --git a/frame/support/test/tests/construct_runtime.rs b/frame/support/test/tests/construct_runtime.rs
@@ -16,7 +16,7 @@
 // limitations under the License.
 
 //! General tests for construct_runtime macro, test for:
-//! * error declareed with decl_error works
+//! * error declared with decl_error works
 //! * integrity test is generated
 
 #![recursion_limit = "128"]
@@ -254,7 +254,7 @@ impl system::Config for Runtime {
 }
 
 frame_support::construct_runtime!(
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs b/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		Block = Block1,

diff --git a/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs b/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs
@@ -20,7 +20,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 impl pallet::Config for Runtime {}
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_index.rs b/frame/support/test/tests/construct_runtime_ui/conflicting_index.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		UncheckedExtrinsic = UncheckedExtrinsic,
 		Block = Block,
 		NodeBlock = Block,

diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.rs b/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		UncheckedExtrinsic = UncheckedExtrinsic,
 		Block = Block,
 		NodeBlock = Block,

diff --git a/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs b/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs b/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.rs b/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		UncheckedExtrinsic = UncheckedExtrinsic,
 		Block = Block,
 		NodeBlock = Block,

diff --git a/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs b/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/exclude_missspell.rs b/frame/support/test/tests/construct_runtime_ui/exclude_missspell.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		UncheckedExtrinsic = UncheckedExtrinsic,
 		Block = Block,
 		NodeBlock = Block,

diff --git a/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs b/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs
@@ -25,7 +25,7 @@ pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Sign
 impl pallet::Config for Runtime {}
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs b/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs b/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs b/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs b/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs b/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs b/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs b/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs b/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		TypeX = Block,

diff --git a/.../support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs b/.../support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs b/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/...support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs b/...support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs b/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic

diff --git a/frame/support/test/tests/construct_runtime_ui/missing_where_block.rs b/frame/support/test/tests/construct_runtime_ui/missing_where_block.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime {}
+	pub struct Runtime {}
 }
 
 fn main() {}
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr b/frame/support/test/tests/construct_runtime_ui/missing_where_block.stderr
@@ -1,5 +1,5 @@
 error: expected `where`
- --> tests/construct_runtime_ui/missing_where_block.rs:4:19
+ --> tests/construct_runtime_ui/missing_where_block.rs:4:21
   |
-4 |     pub enum Runtime {}
-  |                      ^
+4 |     pub struct Runtime {}
+  |                        ^
diff --git a/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs b/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 	{}

diff --git a/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.rs b/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		UncheckedExtrinsic = UncheckedExtrinsic,
 		Block = Block,
 		NodeBlock = Block,

diff --git a/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.rs b/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.rs
@@ -1,7 +1,7 @@
 use frame_support::construct_runtime;
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		UncheckedExtrinsic = UncheckedExtrinsic
 		Block = Block,
 		NodeBlock = Block,

diff --git a/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.rs b/frame/support/test/tests/construct_runtime_ui/no_std_genesis_config.rs
@@ -38,7 +38,7 @@ impl frame_system::Config for Runtime {
 }
 
 construct_runtime! {
-	pub enum Runtime where
+	pub struct Runtime where
 		Block = Block,
 		NodeBlock = Block,
 		UncheckedExtrinsic = UncheckedExtrinsic