From 2673c264145fabc33d17fde4dbf60d1b85e9c4a2 Mon Sep 17 00:00:00 2001
From: Gav Wood <github@gavwood.com>
Date: Tue, 21 Aug 2018 12:19:11 +0200
Subject: [PATCH] Fix logging (#587)
* Fix logging
* Add error info
---
substrate/substrate/executor/src/native_executor.rs | 5 ++++-
substrate/substrate/state-machine/src/lib.rs | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/substrate/substrate/executor/src/native_executor.rs b/substrate/substrate/executor/src/native_executor.rs
index e60aa78d3f2..ed4da107828 100644
--- a/substrate/substrate/executor/src/native_executor.rs
+++ b/substrate/substrate/executor/src/native_executor.rs
@@ -65,7 +65,10 @@ fn fetch_cached_runtime_version<'a, E: Externalities<KeccakHasher>>(
.and_then(|v| RuntimeVersion::decode(&mut v.as_slice()));
RuntimePreproc::ValidCode(module, version)
}
- Err(_) => RuntimePreproc::InvalidCode,
+ Err(e) => {
+ trace!(target: "executor", "Invalid code presented to executor ({:?})", e);
+ RuntimePreproc::InvalidCode
+ }
});
match maybe_runtime_preproc {
RuntimePreproc::InvalidCode => Err(ErrorKind::InvalidCode(code.into()).into()),
diff --git a/substrate/substrate/state-machine/src/lib.rs b/substrate/substrate/state-machine/src/lib.rs
index 17ccc412287..8d3eaa06f11 100644
--- a/substrate/substrate/state-machine/src/lib.rs
+++ b/substrate/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 {
--
GitLab