pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-14 06:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle panics in native execution.

Browse Source
This commit is contained in:
Gav
2018-01-26 15:24:12 +01:00
parent ead42293bc
commit bbac6f8da1
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/executor/src/native_executor.rs
+3 -3
View File
@@ -1,3 +1,4 @@
use std::panic::catch_unwind;
use primitives::contract::CallData; use primitives::contract::CallData;
use state_machine::{Externalities, CodeExecutor}; use state_machine::{Externalities, CodeExecutor};
use error::{Error, ErrorKind, Result}; use error::{Error, ErrorKind, Result};
@@ -22,9 +23,8 @@ impl CodeExecutor for NativeExecutor {
let native_equivalent = include_bytes!("../../wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm"); let native_equivalent = include_bytes!("../../wasm-runtime/target/wasm32-unknown-unknown/release/runtime_polkadot.compact.wasm");
if code == &native_equivalent[..] { if code == &native_equivalent[..] {
runtime_support::with_externalities(ext, || match method { runtime_support::with_externalities(ext, || match method {
// TODO: Panic handler that comes back with error. "execute_block" => catch_unwind(|| runtime::execute_block(&data.0)).map_err(|_| ErrorKind::Runtime.into()),
"execute_block" => Ok(runtime::execute_block(&data.0)), "execute_transaction" => catch_unwind(|| runtime::execute_transaction(&data.0)).map_err(|_| ErrorKind::Runtime.into()),
"execute_transaction" => Ok(runtime::execute_transaction(&data.0)),
_ => Err(ErrorKind::MethodNotFound(method.to_owned()).into()), _ => Err(ErrorKind::MethodNotFound(method.to_owned()).into()),
}) })
} else { } else {