Skip to content

Fix dev executor #367

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ark930 merged 1 commit into from
Oct 20, 2021
Merged

Fix dev executor #367

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 11 additions & 5 deletions node/service/src/dev.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ use futures::StreamExt;
use jsonrpc_core::IoHandler;
use node_rpc::{self, RpcExtension};
use sc_consensus::LongestChain;
use sc_executor::native_executor_instance;
pub use sc_executor::NativeExecutor;
use sc_executor::NativeElseWasmExecutor;
use sc_rpc::Metadata;
use sc_service::{error::Error as ServiceError, Configuration, PartialComponents, TaskManager};
use sc_telemetry::TelemetryWorker;
Expand All @@ -46,9 +45,9 @@ impl sc_executor::NativeExecutionDispatch for DevRuntimeExecutor {
}

pub type Block = dev_runtime::Block;
pub type Executor = DevExecutor;
pub type Executor = DevRuntimeExecutor;
pub type RuntimeApi = dev_runtime::RuntimeApi;
pub type FullClient = sc_service::TFullClient<Block, RuntimeApi, Executor>;
pub type FullClient = sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>;
pub type FullBackend = sc_service::TFullBackend<Block>;
pub type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;

Expand Down Expand Up @@ -89,10 +88,17 @@ pub fn new_partial(
})
.transpose()?;

let executor = NativeElseWasmExecutor::<Executor>::new(
config.wasm_method,
config.default_heap_pages,
config.max_runtime_instances,
);

let (client, backend, keystore_container, task_manager) =
sc_service::new_full_parts::<Block, RuntimeApi, Executor>(
sc_service::new_full_parts::<Block, RuntimeApi, NativeElseWasmExecutor<Executor>>(
&config,
telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
executor,
)?;

let client = Arc::new(client);
Expand Down