Revert "Add option to enable native execution in LocalCallExecutor"

This reverts commit c03b0d6.
gear-tech · Jul 11, 2024 · 652e809 · 652e809
1 parent 7a41c56
commit 652e809
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 37 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/substrate/client/api/src/call_executor.rs b/substrate/client/api/src/call_executor.rs
@@ -48,8 +48,6 @@ pub trait CallExecutor<B: BlockT>: RuntimeVersionOf {
 	/// The backend used by the node.
 	type Backend: crate::backend::Backend<B>;
 
-	fn gear_use_native(&mut self) {}
-
 	/// Returns the [`ExecutionExtensions`].
 	fn execution_extensions(&self) -> &ExecutionExtensions<B>;
 

diff --git a/substrate/client/service/src/client/call_executor.rs b/substrate/client/service/src/client/call_executor.rs
@@ -39,7 +39,6 @@ pub struct LocalCallExecutor<Block: BlockT, B, E> {
 	wasm_override: Arc<Option<WasmOverride>>,
 	wasm_substitutes: WasmSubstitutes<Block, E, B>,
 	execution_extensions: Arc<ExecutionExtensions<Block>>,
-	gear_use_native: bool,
 }
 
 impl<Block: BlockT, B, E> LocalCallExecutor<Block, B, E>
@@ -72,7 +71,6 @@ where
 			wasm_override: Arc::new(wasm_override),
 			wasm_substitutes,
 			execution_extensions: Arc::new(execution_extensions),
-			gear_use_native: false,
 		})
 	}
 
@@ -143,7 +141,6 @@ where
 			wasm_override: self.wasm_override.clone(),
 			wasm_substitutes: self.wasm_substitutes.clone(),
 			execution_extensions: self.execution_extensions.clone(),
-			gear_use_native: self.gear_use_native,
 		}
 	}
 }
@@ -158,10 +155,6 @@ where
 
 	type Backend = B;
 
-	fn gear_use_native(&mut self) {
-		self.gear_use_native = true;
-	}
-
 	fn execution_extensions(&self) -> &ExecutionExtensions<Block> {
 		&self.execution_extensions
 	}
@@ -244,11 +237,6 @@ where
 					call_context,
 				)
 				.set_parent_hash(at_hash);
-
-				if self.gear_use_native {
-					state_machine.gear_use_native();
-				}
-
 				state_machine.execute()
 			},
 			None => {
@@ -263,11 +251,6 @@ where
 					call_context,
 				)
 				.set_parent_hash(at_hash);
-
-				if self.gear_use_native {
-					state_machine.gear_use_native();
-				}
-
 				state_machine.execute()
 			},
 		}

diff --git a/substrate/client/service/src/client/client.rs b/substrate/client/service/src/client/client.rs
@@ -451,10 +451,6 @@ where
 		})
 	}
 
-	pub fn gear_use_native(&mut self) {
-		self.executor.gear_use_native();
-	}
-
 	/// returns a reference to the block import notification sinks
 	/// useful for test environments.
 	pub fn import_notification_sinks(&self) -> &NotificationSinks<BlockImportNotification<Block>> {

diff --git a/substrate/primitives/state-machine/src/lib.rs b/substrate/primitives/state-machine/src/lib.rs
@@ -209,7 +209,6 @@ mod execution {
 		/// Used for logging.
 		parent_hash: Option<H::Out>,
 		context: CallContext,
-		gear_use_native: bool,
 	}
 
 	impl<'a, B, H, Exec> Drop for StateMachine<'a, B, H, Exec>
@@ -251,7 +250,6 @@ mod execution {
 				stats: StateMachineStats::default(),
 				parent_hash: None,
 				context,
-				gear_use_native: false,
 			}
 		}
 
@@ -291,14 +289,7 @@ mod execution {
 
 			let result = self
 				.exec
-				.call(
-					&mut ext,
-					self.runtime_code,
-					self.method,
-					self.call_data,
-					self.gear_use_native,
-					self.context,
-				)
+				.call(&mut ext, self.runtime_code, self.method, self.call_data, false, self.context)
 				.0;
 
 			self.overlay
@@ -314,10 +305,6 @@ mod execution {
 
 			result.map_err(|e| Box::new(e) as Box<_>)
 		}
-
-		pub fn gear_use_native(&mut self) {
-			self.gear_use_native = true;
-		}
 	}
 
 	/// Prove execution using the given state backend, overlayed changes, and call executor.