diff --git a/src/backend.rs b/src/backend.rs index 9bcd49d..5d0d68a 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -957,12 +957,11 @@ impl DatabaseRef for SharedBackend { fn basic_ref(&self, address: Address) -> Result, Self::Error> { trace!(target: "sharedbackend", %address, "request basic"); - self.do_get_basic(address).map_err(|err| { + self.do_get_basic(address).inspect_err(|err| { error!(target: "sharedbackend", %err, %address, "Failed to send/recv `basic`"); if err.is_possibly_non_archive_node_error() { error!(target: "sharedbackend", "{NON_ARCHIVE_NODE_WARNING}"); } - err }) } @@ -972,23 +971,21 @@ impl DatabaseRef for SharedBackend { fn storage_ref(&self, address: Address, index: U256) -> Result { trace!(target: "sharedbackend", "request storage {:?} at {:?}", address, index); - self.do_get_storage(address, index).map_err(|err| { + self.do_get_storage(address, index).inspect_err(|err| { error!(target: "sharedbackend", %err, %address, %index, "Failed to send/recv `storage`"); if err.is_possibly_non_archive_node_error() { error!(target: "sharedbackend", "{NON_ARCHIVE_NODE_WARNING}"); } - err }) } fn block_hash_ref(&self, number: u64) -> Result { trace!(target: "sharedbackend", "request block hash for number {:?}", number); - self.do_get_block_hash(number).map_err(|err| { + self.do_get_block_hash(number).inspect_err(|err| { error!(target: "sharedbackend", %err, %number, "Failed to send/recv `block_hash`"); if err.is_possibly_non_archive_node_error() { error!(target: "sharedbackend", "{NON_ARCHIVE_NODE_WARNING}"); } - err }) } } diff --git a/src/cache.rs b/src/cache.rs index 752eb81..2541828 100644 --- a/src/cache.rs +++ b/src/cache.rs @@ -386,13 +386,11 @@ impl JsonBlockCacheDB { pub fn load(path: impl Into) -> eyre::Result { let path = path.into(); trace!(target: "cache", ?path, "reading json cache"); - let contents = std::fs::read_to_string(&path).map_err(|err| { + let contents = std::fs::read_to_string(&path).inspect_err(|err| { warn!(?err, ?path, "Failed to read cache file"); - err })?; - let data = serde_json::from_str(&contents).map_err(|err| { + let data = serde_json::from_str(&contents).inspect_err(|err| { warn!(target: "cache", ?err, ?path, "Failed to deserialize cache data"); - err })?; trace!(target: "cache", ?path, "read json cache"); Ok(Self { cache_path: Some(path), data })