Merge pull request paritytech#34 from mangata-finance/feature/block-execution-benchmarks

introduce compile time switch for omitting extrinsics execution

Author: mateuszaaa

frame/executive/Cargo.toml

@@ -30,7 +30,6 @@ sp-arithmetic = { version = "4.0.0-dev", default-features = false, path = "../..
 sp-keystore = { version = "0.10.0-dev", default-features = false, path = "../../primitives/keystore", optional=true}
 schnorrkel = { version = "0.9.1", features = ["preaudit_deprecated", "u64_backend"], default-features = false}
 merlin = { version = "2.0", default-features = false }
-    
 
 [dev-dependencies]
 hex-literal = "0.3.4"
@@ -44,6 +43,7 @@ sp-inherents = { version = "4.0.0-dev", path = "../../primitives/inherents" }
 
 [features]
 default = ["std"]
+disable-execution = []
 with-tracing = ["sp-tracing/with-tracing"]
 std = [
 	"codec/std",

frame/executive/src/lib.rs

@@ -411,6 +411,7 @@ where
 
 			// execute extrinsics
 			let (header, extrinsics) = block.deconstruct();
+
 			Self::execute_extrinsics_with_book_keeping(extrinsics, *header.number());
 
 			if !signature_batching.verify() {
@@ -459,7 +460,7 @@ where
 			).collect();
 			let shuffled_extrinsics = extrinsic_shuffler::shuffle_using_seed(extrinsics_with_author, &header.seed().seed);
 
-			Self::execute_extrinsics_with_book_keeping(shuffled_extrinsics, *header.number());
+			Self::execute_extrinsics_impl(shuffled_extrinsics, *header.number());
 
 			if !signature_batching.verify() {
 				panic!("Signature verification failed.");
@@ -488,6 +489,38 @@ where
 		Self::idle_and_finalize_hook(block_number);
 	}
 
+	#[cfg(not(feature = "disable-execution"))]
+	/// regular impl execute inherents & extrinsics
+	fn execute_extrinsics_impl(
+		extrinsics: Vec<Block::Extrinsic>,
+		block_number: NumberFor<Block>,
+	) {
+		Self::execute_extrinsics_with_book_keeping(extrinsics, block_number)
+	}
+
+	#[cfg(feature = "disable-execution")]
+	/// impl for benchmark -  execute inherents only
+	fn execute_extrinsics_impl(
+		extrinsics: Vec<Block::Extrinsic>,
+		block_number: NumberFor<Block>,
+	) {
+		extrinsics.into_iter()
+			.filter(|e| !e.is_signed().unwrap())
+			.for_each(|e| {
+			if let Err(e) = Self::apply_extrinsic(e) {
+				let err: &'static str = e.into();
+				panic!("{}", err)
+			}
+		});
+
+		// post-extrinsics book-keeping
+		<frame_system::Pallet<System>>::note_finished_extrinsics();
+
+		Self::idle_and_finalize_hook(block_number);
+	}
+
+
+
 	/// Finalize the block - it is up the caller to ensure that all header fields are valid
 	/// except state-root.
 	pub fn finalize_block() -> System::Header {