From 877ff474307177d088def2aa9960bcaeb1a3b4a9 Mon Sep 17 00:00:00 2001 From: sslivkoff Date: Wed, 27 Dec 2023 11:43:11 -0800 Subject: [PATCH 1/2] update parse url and timestamp tests --- crates/cli/src/parse/source.rs | 8 +++----- crates/cli/src/parse/timestamps.rs | 2 +- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/crates/cli/src/parse/source.rs b/crates/cli/src/parse/source.rs index 133466b..9b752ec 100644 --- a/crates/cli/src/parse/source.rs +++ b/crates/cli/src/parse/source.rs @@ -4,14 +4,12 @@ use ethers::prelude::*; use governor::{Quota, RateLimiter}; use polars::prelude::*; use std::num::NonZeroU32; - use cryo_freeze::{Fetcher, ParseError, Source, SourceLabels}; - use crate::args::Args; pub(crate) async fn parse_source(args: &Args) -> Result { // parse network info - let rpc_url = parse_rpc_url(args); + let rpc_url = parse_rpc_url(args)?; let provider = Provider::>::new_client(&rpc_url, args.max_retries, args.initial_backoff) .map_err(|_e| ParseError::ParseError("could not connect to provider".to_string()))?; @@ -57,7 +55,7 @@ pub(crate) async fn parse_source(args: &Args) -> Result { Ok(output) } -fn parse_rpc_url(args: &Args) -> String { +pub(crate) fn parse_rpc_url(args: &Args) -> Result { let mut url = match &args.rpc { Some(url) => url.clone(), _ => match env::var("ETH_RPC_URL") { @@ -71,5 +69,5 @@ fn parse_rpc_url(args: &Args) -> String { if !url.starts_with("http") { url = "http://".to_string() + url.as_str(); }; - url + Ok(url) } diff --git a/crates/cli/src/parse/timestamps.rs b/crates/cli/src/parse/timestamps.rs index 8ee4a59..78bc629 100644 --- a/crates/cli/src/parse/timestamps.rs +++ b/crates/cli/src/parse/timestamps.rs @@ -335,7 +335,7 @@ mod tests { use super::*; async fn setup_fetcher() -> Fetcher> { - let rpc_url = String::from("https://eth.merkle.io"); + let rpc_url = crate::parse::source::parse_rpc_url(&Args::default()).unwrap(); let max_retry = 5; let initial_backoff = 500; let max_concurrent_requests = 100; From 441fcb9399d3a8afbb3b1168fc5590cd71755f9a Mon Sep 17 00:00:00 2001 From: sslivkoff Date: Wed, 27 Dec 2023 11:45:32 -0800 Subject: [PATCH 2/2] format --- crates/cli/src/parse/source.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/cli/src/parse/source.rs b/crates/cli/src/parse/source.rs index 9b752ec..2b861f8 100644 --- a/crates/cli/src/parse/source.rs +++ b/crates/cli/src/parse/source.rs @@ -1,11 +1,11 @@ use std::env; +use crate::args::Args; +use cryo_freeze::{Fetcher, ParseError, Source, SourceLabels}; use ethers::prelude::*; use governor::{Quota, RateLimiter}; use polars::prelude::*; use std::num::NonZeroU32; -use cryo_freeze::{Fetcher, ParseError, Source, SourceLabels}; -use crate::args::Args; pub(crate) async fn parse_source(args: &Args) -> Result { // parse network info