From 036e935819bb892cfb4b8c66ba702822a4ea80e7 Mon Sep 17 00:00:00 2001
From: Tom French <15848336+TomAFrench@users.noreply.github.com>
Date: Sat, 25 Feb 2023 15:10:44 +0000
Subject: [PATCH] chore: clippy fixes (#1558)

---
 bin/reth/src/args/rpc_server_args.rs | 2 +-
 bin/reth/src/db/tui.rs               | 2 +-
 crates/rpc/rpc/src/eth/api/block.rs  | 8 +++-----
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/bin/reth/src/args/rpc_server_args.rs b/bin/reth/src/args/rpc_server_args.rs
index 5476b0f761..0afb2a016e 100644
--- a/bin/reth/src/args/rpc_server_args.rs
+++ b/bin/reth/src/args/rpc_server_args.rs
@@ -183,7 +183,7 @@ impl RpcServerArgs {
             config = config
                 .with_http_address(socket_address)
                 .with_http(ServerBuilder::new())
-                .with_cors(self.http_corsdomain.clone().unwrap_or("".to_string()));
+                .with_cors(self.http_corsdomain.clone().unwrap_or_default());
         }
 
         if self.ws {
diff --git a/bin/reth/src/db/tui.rs b/bin/reth/src/db/tui.rs
index e2361542ba..1121d1af68 100644
--- a/bin/reth/src/db/tui.rs
+++ b/bin/reth/src/db/tui.rs
@@ -190,7 +190,7 @@ fn ui<B: Backend, T: Table>(f: &mut Frame<'_, B>, app: &mut DbListTUI<T>) {
             serde_json::to_string_pretty(
                 &app.entries.values().collect::<Vec<_>>()[app.state.selected().unwrap_or(0)],
             )
-            .unwrap_or(String::from("Error serializing value!")),
+            .unwrap_or_else(|_| String::from("Error serializing value!")),
         )
         .block(Block::default().borders(Borders::ALL).title("Value (JSON)"))
         .wrap(Wrap { trim: false })
diff --git a/crates/rpc/rpc/src/eth/api/block.rs b/crates/rpc/rpc/src/eth/api/block.rs
index a66aa366f4..158ba31d56 100644
--- a/crates/rpc/rpc/src/eth/api/block.rs
+++ b/crates/rpc/rpc/src/eth/api/block.rs
@@ -49,11 +49,9 @@ where
             let block_hash = self
                 .client()
                 .block_hash_for_id(block_id)?
-                .ok_or_else(|| EthApiError::UnknownBlockNumber)?;
-            let total_difficulty = self
-                .client()
-                .header_td(&block_hash)?
-                .ok_or_else(|| EthApiError::UnknownBlockNumber)?;
+                .ok_or(EthApiError::UnknownBlockNumber)?;
+            let total_difficulty =
+                self.client().header_td(&block_hash)?.ok_or(EthApiError::UnknownBlockNumber)?;
             let block = Block::from_block(block, total_difficulty, full.into(), Some(block_hash))?;
             Ok(Some(block.into()))
         } else {