From 94c67b2878fe4d185e52abcd65a1f73a24108c47 Mon Sep 17 00:00:00 2001 From: kamuik16 Date: Fri, 19 Apr 2024 22:37:54 +0530 Subject: [PATCH 1/3] return logs in all cases --- crates/cast/bin/cmd/logs.rs | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/crates/cast/bin/cmd/logs.rs b/crates/cast/bin/cmd/logs.rs index dd66176e8edc..85ca52fdf66a 100644 --- a/crates/cast/bin/cmd/logs.rs +++ b/crates/cast/bin/cmd/logs.rs @@ -81,8 +81,17 @@ impl LogsArgs { None => None, }; - let from_block = cast.convert_block_number(from_block).await?; - let to_block = cast.convert_block_number(to_block).await?; + let from_block = if let Some(_) = from_block { + cast.convert_block_number(from_block).await? + } else { + cast.convert_block_number(Some(BlockId::Number(BlockNumberOrTag::Earliest))).await? + }; + + let to_block = if let Some(_) = to_block { + cast.convert_block_number(to_block).await? + } else { + cast.convert_block_number(Some(BlockId::Number(BlockNumberOrTag::Latest))).await? + }; let filter = build_filter(from_block, to_block, address, sig_or_topic, topics_or_args)?; From edc6d9969bedd3089272451c79a6364ad3d30fa9 Mon Sep 17 00:00:00 2001 From: kamuik16 Date: Fri, 19 Apr 2024 22:49:15 +0530 Subject: [PATCH 2/3] make clippy happy --- crates/cast/bin/cmd/logs.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/cast/bin/cmd/logs.rs b/crates/cast/bin/cmd/logs.rs index 85ca52fdf66a..16db10c807f3 100644 --- a/crates/cast/bin/cmd/logs.rs +++ b/crates/cast/bin/cmd/logs.rs @@ -81,13 +81,13 @@ impl LogsArgs { None => None, }; - let from_block = if let Some(_) = from_block { + let from_block = if from_block.is_some() { cast.convert_block_number(from_block).await? } else { cast.convert_block_number(Some(BlockId::Number(BlockNumberOrTag::Earliest))).await? }; - let to_block = if let Some(_) = to_block { + let to_block = if to_block.is_some() { cast.convert_block_number(to_block).await? } else { cast.convert_block_number(Some(BlockId::Number(BlockNumberOrTag::Latest))).await? From 8f700fb442e01c6e8b859364cc68703d442c5fd0 Mon Sep 17 00:00:00 2001 From: kamuik16 Date: Fri, 19 Apr 2024 22:59:54 +0530 Subject: [PATCH 3/3] nits --- crates/cast/bin/cmd/logs.rs | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/crates/cast/bin/cmd/logs.rs b/crates/cast/bin/cmd/logs.rs index 16db10c807f3..85f0c8414d67 100644 --- a/crates/cast/bin/cmd/logs.rs +++ b/crates/cast/bin/cmd/logs.rs @@ -81,17 +81,10 @@ impl LogsArgs { None => None, }; - let from_block = if from_block.is_some() { - cast.convert_block_number(from_block).await? - } else { - cast.convert_block_number(Some(BlockId::Number(BlockNumberOrTag::Earliest))).await? - }; - - let to_block = if to_block.is_some() { - cast.convert_block_number(to_block).await? - } else { - cast.convert_block_number(Some(BlockId::Number(BlockNumberOrTag::Latest))).await? - }; + let from_block = + cast.convert_block_number(Some(from_block.unwrap_or_else(BlockId::earliest))).await?; + let to_block = + cast.convert_block_number(Some(to_block.unwrap_or_else(BlockId::latest))).await?; let filter = build_filter(from_block, to_block, address, sig_or_topic, topics_or_args)?;