From 93350f018be4a2269aedf2e94cefb102e0a98be9 Mon Sep 17 00:00:00 2001 From: Gav Date: Tue, 21 Aug 2018 10:21:55 +0200 Subject: [PATCH 1/2] Fix logging --- substrate/executor/src/native_executor.rs | 5 ++++- substrate/state-machine/src/lib.rs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/substrate/executor/src/native_executor.rs b/substrate/executor/src/native_executor.rs index e60aa78d3f264..21f5bba1b3308 100644 --- a/substrate/executor/src/native_executor.rs +++ b/substrate/executor/src/native_executor.rs @@ -65,7 +65,10 @@ fn fetch_cached_runtime_version<'a, E: Externalities>( .and_then(|v| RuntimeVersion::decode(&mut v.as_slice())); RuntimePreproc::ValidCode(module, version) } - Err(_) => RuntimePreproc::InvalidCode, + Err(_) => { + trace!(target: "executor", "Invalid code presented to executor"); + RuntimePreproc::InvalidCode + } }); match maybe_runtime_preproc { RuntimePreproc::InvalidCode => Err(ErrorKind::InvalidCode(code.into()).into()), diff --git a/substrate/state-machine/src/lib.rs b/substrate/state-machine/src/lib.rs index 17ccc412287be..8d3eaa06f11cc 100644 --- a/substrate/state-machine/src/lib.rs +++ b/substrate/state-machine/src/lib.rs @@ -370,7 +370,7 @@ where }; if (result.is_ok() && wasm_result.is_ok() && result.as_ref().unwrap() == wasm_result.as_ref().unwrap()/* && delta == wasm_delta*/) - || (result.is_err() && wasm_result.is_err() && format!("{}", result.as_ref().unwrap_err()) == format!("{}", wasm_result.as_ref().unwrap_err())) + || (result.is_err() && wasm_result.is_err()) { (result, delta) } else { From 55c493357e7c07d021425de45952c590c5bc4c0d Mon Sep 17 00:00:00 2001 From: Gav Date: Tue, 21 Aug 2018 11:43:12 +0200 Subject: [PATCH 2/2] Add error info --- substrate/executor/src/native_executor.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/substrate/executor/src/native_executor.rs b/substrate/executor/src/native_executor.rs index 21f5bba1b3308..ed4da10782872 100644 --- a/substrate/executor/src/native_executor.rs +++ b/substrate/executor/src/native_executor.rs @@ -65,8 +65,8 @@ fn fetch_cached_runtime_version<'a, E: Externalities>( .and_then(|v| RuntimeVersion::decode(&mut v.as_slice())); RuntimePreproc::ValidCode(module, version) } - Err(_) => { - trace!(target: "executor", "Invalid code presented to executor"); + Err(e) => { + trace!(target: "executor", "Invalid code presented to executor ({:?})", e); RuntimePreproc::InvalidCode } });