try-runtime: Use configured wasm execution method (paritytech#13694)

* try-runtime: Use configured wasm execution method * Fix compilation (cherry picked from commit d0449fd)
ekovalev · Jul 3, 2023 · 6fedf4d · 6fedf4d
1 parent 8b7d319
commit 6fedf4d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/client/cli/src/arg_enums.rs b/client/cli/src/arg_enums.rs
@@ -74,12 +74,12 @@ impl std::fmt::Display for WasmExecutionMethod {
 /// into an execution method which can be used internally.
 pub fn execution_method_from_cli(
 	execution_method: WasmExecutionMethod,
-	_instantiation_strategy: WasmtimeInstantiationStrategy,
+	instantiation_strategy: WasmtimeInstantiationStrategy,
 ) -> sc_service::config::WasmExecutionMethod {
 	match execution_method {
 		WasmExecutionMethod::Interpreted => sc_service::config::WasmExecutionMethod::Interpreted,
 		WasmExecutionMethod::Compiled => sc_service::config::WasmExecutionMethod::Compiled {
-			instantiation_strategy: match _instantiation_strategy {
+			instantiation_strategy: match instantiation_strategy {
 				WasmtimeInstantiationStrategy::PoolingCopyOnWrite =>
 					sc_service::config::WasmtimeInstantiationStrategy::PoolingCopyOnWrite,
 				WasmtimeInstantiationStrategy::RecreateInstanceCopyOnWrite =>

diff --git a/utils/frame/try-runtime/cli/src/lib.rs b/utils/frame/try-runtime/cli/src/lib.rs
@@ -133,7 +133,6 @@
 //! given the right flag:
 //!
 //! ```ignore
-//! 
 //! #[cfg(feature = "try-runtime")]
 //! fn pre_upgrade() -> Result<Vec<u8>, &'static str> {}
 //!
@@ -365,8 +364,9 @@ use remote_externalities::{
 	TestExternalities,
 };
 use sc_cli::{
-	CliConfiguration, RuntimeVersion, WasmExecutionMethod, WasmtimeInstantiationStrategy,
-	DEFAULT_WASMTIME_INSTANTIATION_STRATEGY, DEFAULT_WASM_EXECUTION_METHOD,
+	execution_method_from_cli, CliConfiguration, RuntimeVersion, WasmExecutionMethod,
+	WasmtimeInstantiationStrategy, DEFAULT_WASMTIME_INSTANTIATION_STRATEGY,
+	DEFAULT_WASM_EXECUTION_METHOD,
 };
 use sc_executor::{sp_wasm_interface::HostFunctions, WasmExecutor};
 use sp_api::HashT;
@@ -832,7 +832,7 @@ pub(crate) fn build_executor<H: HostFunctions>(shared: &SharedParams) -> WasmExe
 	let runtime_cache_size = 2;
 
 	WasmExecutor::new(
-		sc_executor::WasmExecutionMethod::Interpreted,
+		execution_method_from_cli(shared.wasm_method, shared.wasmtime_instantiation_strategy),
 		heap_pages,
 		max_runtime_instances,
 		None,