Cleanup

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

client/basic-authorship/src/basic_authorship.rs

@@ -345,7 +345,6 @@ where
 		let mut block_builder =
 			self.client.new_block_at(self.parent_hash, inherent_digests, PR::ENABLED)?;
 
-		// The executive mode does not influence the execution of inherents:
 		self.apply_inherents(&mut block_builder, inherent_data)?;
 
 		let block_timer = time::Instant::now();

frame/executive/src/lib.rs

@@ -318,10 +318,8 @@ impl<
 		}
 
 		Self::after_inherents(mode);
-		if mode == RuntimeExecutiveMode::Minimal {
-			if num_inherents < extrinsics.len() {
-				return Err(InvalidTransaction::NonMandatory.into())
-			}
+		if mode == RuntimeExecutiveMode::Minimal && extrinsics.len() > num_inherents {
+			return Err(InvalidTransaction::NonMandatory.into())
 		}
 		// Apply transactions:
 		for e in extrinsics.iter().skip(num_inherents) {
@@ -551,12 +549,10 @@ impl<
 			// Process inherents (if any).
 			Self::apply_extrinsics(extrinsics.iter().take(num_inherents), mode);
 			Self::after_inherents(mode);
-			if mode == RuntimeExecutiveMode::Minimal {
-				if num_inherents < extrinsics.len() {
-					// Note: It would be possible to not explicitly panic here since the state-root
-					// check should already catch any mismatch, but this makes it easier to debug.
-					panic!("Only inherents are allowed in 'Minimal' blocks");
-				}
+			if mode == RuntimeExecutiveMode::Minimal && extrinsics.len() > num_inherents {
+				// Note: It would be possible to not explicitly panic here since the state-root
+				// check should already catch any mismatch, but this makes it easier to debug.
+				panic!("Only inherents are allowed in 'Minimal' blocks");
 			}
 			// Process transactions (if any).
 			Self::apply_extrinsics(extrinsics.iter().skip(num_inherents), mode);

primitives/api/src/lib.rs

@@ -726,9 +726,9 @@ decl_runtime_apis! {
 		fn execute_block(block: Block);
 		/// Initialize a block with the given header.
 		#[changed_in(5)]
+		#[renamed("initialise_block", 2)]
 		fn initialize_block(header: &<Block as BlockT>::Header);
 		/// Initialize a block with the given header and return the runtime executive mode.
-		#[renamed("initialise_block", 2)]
 		fn initialize_block(header: &<Block as BlockT>::Header) -> RuntimeExecutiveMode;
 	}
 

primitives/runtime/src/lib.rs

@@ -955,14 +955,14 @@ pub enum RuntimeExecutiveMode {
 	/// - Extrinsics with dispatch class `Normal`.
 	/// - `on_idle` hook.
 	Normal,
-	/// Only _really necessary_ logic is allowed to run.
+	/// Only _necessary_ logic is allowed to run.
 	///
 	/// Explicitly forbidden are:
 	/// - Extrinsics with dispatch classes `Normal` and `Operational`.
 	/// - `on_idle` and `poll` hooks.
 	///
 	/// Explicitly allowed are:
-	/// - Mandatory inherents and extrinsics (i.e. via OCW).
+	/// - Mandatory extrinsics (i.e. via OCW).
 	/// - `on_initialize` and `on_finalize` hooks.
 	/// - Storage migrations.
 	///

test-utils/runtime/src/lib.rs

@@ -228,14 +228,8 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(), // no migrations
-	MockedRuntimeExecutiveMode,
 >;
 
-parameter_types! {
-	pub storage MockedRuntimeExecutiveMode: sp_runtime::RuntimeExecutiveMode = Default::default();
-}
-
 #[derive(Copy, Clone, PartialEq, Eq, Encode, Decode, RuntimeDebug, TypeInfo)]
 pub struct CheckSubstrateCall;