Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 3 additions & 6 deletions src/backend.rs
Original file line number Diff line number Diff line change
Expand Up @@ -957,12 +957,11 @@ impl DatabaseRef for SharedBackend {

fn basic_ref(&self, address: Address) -> Result<Option<AccountInfo>, 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
})
}

Expand All @@ -972,23 +971,21 @@ impl DatabaseRef for SharedBackend {

fn storage_ref(&self, address: Address, index: U256) -> Result<U256, Self::Error> {
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<B256, Self::Error> {
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
})
}
}
Expand Down
6 changes: 2 additions & 4 deletions src/cache.rs
Original file line number Diff line number Diff line change
Expand Up @@ -386,13 +386,11 @@ impl JsonBlockCacheDB {
pub fn load(path: impl Into<PathBuf>) -> eyre::Result<Self> {
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 })
Expand Down