Also version initialize_block

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

client/block-builder/src/lib.rs

@@ -175,20 +175,29 @@ where
 		let estimated_header_size = header.encoded_size();
 
 		let mut api = api.runtime_api();
+		let version = api
+			.api_version::<dyn BlockBuilderApi<Block>>(parent_hash)?
+			.ok_or_else(|| Error::VersionInvalid("BlockBuilderApi".to_string()))?;
 
 		if record_proof.yes() {
 			api.record_proof();
 		}
 
-		let executive_mode = api.initialize_block_with_context(
-			parent_hash,
-			ExecutionContext::BlockConstruction,
-			&header,
-		)?;
-
-		let version = api
-			.api_version::<dyn BlockBuilderApi<Block>>(parent_hash)?
-			.ok_or_else(|| Error::VersionInvalid("BlockBuilderApi".to_string()))?;
+		let executive_mode = if version >= 5 {
+			api.initialize_block_with_context(
+				parent_hash,
+				ExecutionContext::BlockConstruction,
+				&header,
+			)?
+		} else {
+			#[allow(deprecated)]
+			api.initialize_block_before_version_5_with_context(
+				parent_hash,
+				ExecutionContext::BlockConstruction,
+				&header,
+			)?;
+			RuntimeExecutiveMode::Normal
+		};
 
 		Ok(Self {
 			parent_hash,

frame/support/test/tests/runtime_metadata.rs

@@ -207,7 +207,7 @@ fn runtime_metadata() {
 						ty: meta_type::<&<Block as BlockT>::Header>(),
 					}],
 					output: meta_type::<sp_runtime::RuntimeExecutiveMode>(),
-					docs: maybe_docs(vec![" Initialize a block with the given header."]),
+					docs: maybe_docs(vec![" Initialize a block with the given header and return the runtime executive mode."]),
 				},
 			],
 			docs: maybe_docs(vec![

primitives/api/src/lib.rs

@@ -725,6 +725,9 @@ decl_runtime_apis! {
 		/// Execute the given block.
 		fn execute_block(block: Block);
 		/// Initialize a block with the given header.
+		#[changed_in(5)]
+		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;
 	}