From 477b3450f464bbe763dad6b38f718fa467e841d2 Mon Sep 17 00:00:00 2001 From: Matthias Seitz Date: Sun, 17 Dec 2023 23:02:10 +0100 Subject: [PATCH] chore: remove outdated clippy (#6614) * chore: remove outdated clippy * chore: rm weird match --- crates/common/src/runtime_client.rs | 1 - crates/evm/core/src/fork/backend.rs | 14 ++++---------- 2 files changed, 4 insertions(+), 11 deletions(-) diff --git a/crates/common/src/runtime_client.rs b/crates/common/src/runtime_client.rs index 972ee9029540..a14ea20593be 100644 --- a/crates/common/src/runtime_client.rs +++ b/crates/common/src/runtime_client.rs @@ -277,7 +277,6 @@ fn url_to_file_path(url: &Url) -> Result { impl JsonRpcClient for RuntimeClient { type Error = RuntimeClientError; - #[allow(implied_bounds_entailment)] async fn request(&self, method: &str, params: T) -> Result where T: Debug + Serialize + Send + Sync, diff --git a/crates/evm/core/src/fork/backend.rs b/crates/evm/core/src/fork/backend.rs index ed708bc01173..4ef698eb6bbd 100644 --- a/crates/evm/core/src/fork/backend.rs +++ b/crates/evm/core/src/fork/backend.rs @@ -661,16 +661,13 @@ impl DatabaseRef for SharedBackend { fn storage_ref(&self, address: Address, index: U256) -> Result { trace!(target: "sharedbackend", "request storage {:?} at {:?}", address, index); - match self.do_get_storage(address, index).map_err(|err| { + self.do_get_storage(address, index).map_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 - }) { - Ok(val) => Ok(val), - Err(err) => Err(err), - } + }) } fn block_hash_ref(&self, number: U256) -> Result { @@ -680,16 +677,13 @@ impl DatabaseRef for SharedBackend { let number: U256 = number; let number = number.to(); trace!(target: "sharedbackend", "request block hash for number {:?}", number); - match self.do_get_block_hash(number).map_err(|err| { + self.do_get_block_hash(number).map_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 - }) { - Ok(val) => Ok(val), - Err(err) => Err(err), - } + }) } }