Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

try-runtime: Use configured wasm execution method #13694

Merged
merged 3 commits into from
Mar 24, 2023
Merged

try-runtime: Use configured wasm execution method #13694

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1404a2a
try-runtime: Use configured wasm execution method
bkchr Mar 23, 2023
8205f9f
Fix compilation
bkchr Mar 23, 2023
88bb068
Merge branch 'master' into bkchr-try-runtime-executor
bkchr Mar 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions client/cli/src/arg_enums.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 =>
Expand Down
8 changes: 4 additions & 4 deletions utils/frame/try-runtime/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
//! given the right flag:
//!
//! ```ignore
//!
//! #[cfg(feature = "try-runtime")]
//! fn pre_upgrade() -> Result<Vec<u8>, &'static str> {}
//!
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -831,7 +831,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,
Expand Down