,
}
-/// Wrapper over `Provider` that adds concurrency and rate limiting controls
-#[derive(Debug)]
-pub struct Fetcher
{
- /// provider data source
- pub provider: RootProvider
,
- /// semaphore for controlling concurrency
- pub semaphore: Option,
- /// rate limiter for controlling request rate
- pub rate_limiter: Option,
-}
-
type Result = ::core::result::Result;
// impl Fetcher {
@@ -238,9 +227,12 @@ impl Source {
trace_types: Vec,
) -> Result> {
let _permit = self.permit_request().await;
- Self::map_err(
- self.provider.trace_replay_block_transactions(block.into(), &trace_types).await,
- )
+ let trace_result = self
+ .provider
+ .trace_replay_block_transactions(block.into())
+ .trace_types(trace_types)
+ .await;
+ Self::map_err(trace_result)
}
/// Get state diff traces of block
@@ -298,7 +290,9 @@ impl Source {
trace_types: Vec,
) -> Result {
let _permit = self.permit_request().await;
- Self::map_err(self.provider.trace_replay_transaction(tx_hash, &trace_types).await)
+ let trace_result =
+ self.provider.trace_replay_transaction(tx_hash).trace_types(trace_types).await;
+ Self::map_err(trace_result)
}
/// Get state diff traces of transaction
@@ -348,7 +342,8 @@ impl Source {
kind: BlockTransactionsKind,
) -> Result> {
let _permit = self.permit_request().await;
- Self::map_err(self.provider.get_block(block_num.into(), kind).await)
+ let block_result = self.provider.get_block(block_num.into()).kind(kind).await;
+ Self::map_err(block_result)
}
/// Gets the block with `block_hash` (transaction hashes only)
@@ -358,7 +353,8 @@ impl Source {
kind: BlockTransactionsKind,
) -> Result> {
let _permit = self.permit_request().await;
- Self::map_err(self.provider.get_block(block_hash.into(), kind).await)
+ let block_result = self.provider.get_block(block_hash.into()).kind(kind).await;
+ Self::map_err(block_result)
}
/// Returns all receipts for a block.
@@ -398,7 +394,7 @@ impl Source {
block_number: BlockNumber,
) -> Result {
let _permit = self.permit_request().await;
- Self::map_err(self.provider.call(&transaction).block(block_number.into()).await)
+ Self::map_err(self.provider.call(transaction).block(block_number.into()).await)
}
/// Returns traces for given call data
@@ -411,10 +407,14 @@ impl Source {
let _permit = self.permit_request().await;
if let Some(bn) = block_number {
return Self::map_err(
- self.provider.trace_call(&transaction, &trace_type).block_id(bn.into()).await,
+ self.provider
+ .trace_call(&transaction)
+ .trace_types(trace_type.clone())
+ .block_id(bn.into())
+ .await,
);
}
- Self::map_err(self.provider.trace_call(&transaction, &trace_type).await)
+ Self::map_err(self.provider.trace_call(&transaction).trace_types(trace_type.clone()).await)
}
/// Get nonce of address
@@ -495,7 +495,7 @@ impl Source {
..Default::default()
};
let _permit = self.permit_request().await;
- Self::map_err(self.provider.call(&transaction).block(block_number.into()).await)
+ Self::map_err(self.provider.call(transaction).block(block_number.into()).await)
}
/// Return output data of a contract call
@@ -512,15 +512,18 @@ impl Source {
..Default::default()
};
let _permit = self.permit_request().await;
- if block_number.is_some() {
+ if let Some(bn) = block_number {
Self::map_err(
self.provider
- .trace_call(&transaction, &trace_type)
- .block_id(block_number.unwrap().into())
+ .trace_call(&transaction)
+ .trace_types(trace_type.clone())
+ .block_id(bn.into())
.await,
)
} else {
- Self::map_err(self.provider.trace_call(&transaction, &trace_type).await)
+ Self::map_err(
+ self.provider.trace_call(&transaction).trace_types(trace_type.clone()).await,
+ )
}
}
@@ -584,15 +587,13 @@ impl Source {
GethTrace::JS(value) => calls.push(value),
_ => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}",
- tx_hash
+ "invalid trace result in tx {tx_hash:?}"
)))
}
},
TraceResult::Error { error, tx_hash } => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}: {}",
- tx_hash, error
+ "invalid trace result in tx {tx_hash:?}: {error}"
)))
}
}
@@ -617,15 +618,13 @@ impl Source {
GethTrace::Default(frame) => calls.push(frame),
_ => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}",
- tx_hash
+ "invalid trace result in tx {tx_hash:?}"
)))
}
},
TraceResult::Error { error, tx_hash } => {
return Err(CollectError::CollectError(format!(
- "inalid trace result in tx {:?}: {}",
- tx_hash, error
+ "inalid trace result in tx {tx_hash:?}: {error}"
)));
}
}
@@ -657,15 +656,13 @@ impl Source {
GethTrace::NoopTracer(_) => {}
_ => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}",
- tx_hash
+ "invalid trace result in tx {tx_hash:?}"
)))
}
},
TraceResult::Error { error, tx_hash } => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}: {}",
- tx_hash, error
+ "invalid trace result in tx {tx_hash:?}: {error}"
)));
}
}
@@ -695,15 +692,13 @@ impl Source {
GethTrace::PreStateTracer(PreStateFrame::Default(frame)) => calls.push(frame.0),
_ => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}",
- tx_hash
+ "invalid trace result in tx {tx_hash:?}"
)))
}
},
TraceResult::Error { error, tx_hash } => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}: {}",
- tx_hash, error
+ "invalid trace result in tx {tx_hash:?}: {error}"
)));
}
}
@@ -738,15 +733,13 @@ impl Source {
GethTrace::CallTracer(frame) => calls.push(frame),
_ => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}",
- tx_hash
+ "invalid trace result in tx {tx_hash:?}"
)))
}
},
TraceResult::Error { error, tx_hash } => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}: {}",
- tx_hash, error
+ "invalid trace result in tx {tx_hash:?}: {error}"
)));
}
}
@@ -784,17 +777,15 @@ impl Source {
diffs.push(diff);
}
_ => {
- println!("{:?}", result);
+ println!("{result:?}");
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}",
- tx_hash
+ "invalid trace result in tx {tx_hash:?}"
)));
}
},
TraceResult::Error { error, tx_hash } => {
return Err(CollectError::CollectError(format!(
- "invalid trace result in tx {:?}: {}",
- tx_hash, error
+ "invalid trace result in tx {tx_hash:?}: {error}"
)));
}
}
diff --git a/crates/freeze/src/types/summaries.rs b/crates/freeze/src/types/summaries.rs
index f760c1d2..7c295748 100644
--- a/crates/freeze/src/types/summaries.rs
+++ b/crates/freeze/src/types/summaries.rs
@@ -52,7 +52,7 @@ pub fn print_all_datasets() {
println!();
print_header("dataset group names");
for datatype in MultiDatatype::variants().iter() {
- let name = heck::AsSnakeCase(format!("{:?}", datatype)).to_string();
+ let name = heck::AsSnakeCase(format!("{datatype:?}")).to_string();
let subtypes =
datatype.datatypes().iter().map(|dt| dt.name()).collect::>().join(", ");
print_bullet(name, subtypes)
@@ -74,7 +74,7 @@ pub fn print_dataset_info(datatype: Datatype, schema: &Table) {
let required_parameters = datatype
.required_parameters()
.iter()
- .map(|x| format!("{}", x))
+ .map(|x| format!("{x}"))
.collect::>()
.join(", ");
let required_parameters =
@@ -84,7 +84,7 @@ pub fn print_dataset_info(datatype: Datatype, schema: &Table) {
let optional_parameters = datatype
.optional_parameters()
.iter()
- .map(|x| format!("{}", x))
+ .map(|x| format!("{x}"))
.collect::>()
.join(", ");
let optional_parameters =
@@ -113,21 +113,21 @@ pub fn print_dataset_info(datatype: Datatype, schema: &Table) {
pub(crate) fn print_header>(header: A) {
let header_str = header.as_ref().white().bold();
let underline = "─".repeat(header_str.len()).truecolor(TITLE_R, TITLE_G, TITLE_B);
- println!("{}", header_str);
- println!("{}", underline);
+ println!("{header_str}");
+ println!("{underline}");
}
pub(crate) fn print_header_error>(header: A) {
let header_str = header.as_ref().white().bold();
let underline = "─".repeat(header_str.len()).truecolor(ERROR_R, ERROR_G, ERROR_B);
- println!("{}", header_str);
- println!("{}", underline);
+ println!("{header_str}");
+ println!("{underline}");
}
fn print_bullet_key>(key: A) {
let bullet_str = "- ".truecolor(TITLE_R, TITLE_G, TITLE_B);
let key_str = key.as_ref().white().bold();
- println!("{}{}", bullet_str, key_str);
+ println!("{bullet_str}{key_str}");
}
fn print_bullet, B: AsRef>(key: A, value: B) {
@@ -135,14 +135,14 @@ fn print_bullet, B: AsRef>(key: A, value: B) {
let key_str = key.as_ref().white().bold();
let value_str = value.as_ref().truecolor(170, 170, 170);
let colon_str = ": ".truecolor(TITLE_R, TITLE_G, TITLE_B);
- println!("{}{}{}{}", bullet_str, key_str, colon_str, value_str);
+ println!("{bullet_str}{key_str}{colon_str}{value_str}");
}
fn print_bullet_parenthetical, B: AsRef>(key: A, value: B) {
let bullet_str = "- ".truecolor(TITLE_R, TITLE_G, TITLE_B);
let key_str = key.as_ref().white().bold();
let value_str = value.as_ref().truecolor(170, 170, 170);
- println!("{}{} ({})", bullet_str, key_str, value_str);
+ println!("{bullet_str}{key_str} ({value_str})");
}
fn print_bullet_indent, B: AsRef>(key: A, value: B, indent: usize) {
@@ -318,7 +318,7 @@ fn print_chunk(
) {
if dim_stats.total_values == 1 {
print_bullet_indent(
- format!("{}", dim),
+ format!("{dim}"),
dim_stats.min_value_to_string().unwrap_or("none".to_string()),
4,
);
@@ -333,13 +333,13 @@ fn print_chunk(
);
match align {
- Some(true) => text = format!("{} align=yes", text),
- Some(false) => text = format!("{} align=no", text),
+ Some(true) => text = format!("{text} align=yes"),
+ Some(false) => text = format!("{text} align=no"),
None => {}
}
if let Some(reorg_buffer) = reorg_buffer {
- text = format!("{} reorg_buffer={}", text, reorg_buffer);
+ text = format!("{text} reorg_buffer={reorg_buffer}");
};
print_bullet_indent(dim.plural_name(), text, 4)
}
@@ -394,7 +394,7 @@ fn print_schema(name: &Datatype, schema: &Table) {
name.column_types().keys().copied().filter(|x| !schema.has_column(x)).collect::>();
let other_columns =
if other_columns.is_empty() { "[none]".to_string() } else { other_columns.join(", ") };
- println!("\nother available columns: {}", other_columns);
+ println!("\nother available columns: {other_columns}");
}
pub(crate) fn print_cryo_conclusion(
@@ -430,7 +430,7 @@ pub(crate) fn print_cryo_conclusion(
*error_counts.entry(error.to_string()).or_insert(0) += 1;
}
for (error, count) in error_counts.iter().take(10) {
- println!("- {} ({}x)", error, count);
+ println!("- {error} ({count}x)");
}
if error_counts.len() > 10 {
println!("...")
@@ -449,7 +449,7 @@ pub(crate) fn print_cryo_conclusion(
let seconds = duration.as_secs();
let millis = duration.subsec_millis();
let total_time = (seconds as f64) + (duration.subsec_nanos() as f64) / 1e9;
- let duration_string = format!("{}.{:03} seconds", seconds, millis);
+ let duration_string = format!("{seconds}.{millis:03} seconds");
print_header("collection summary");
print_bullet("total duration", duration_string);
@@ -579,8 +579,7 @@ fn format_float(number: f64) -> String {
return format!("{}.0", int_part.separate_with_commas())
}
- let frac_str =
- format!("{:0>width$}", frac_part, width = decimal_places).trim_end_matches('0').to_string();
+ let frac_str = format!("{frac_part:0>decimal_places$}").trim_end_matches('0').to_string();
format!("{}.{}", int_part.separate_with_commas(), frac_str)
}
diff --git a/crates/python/rust/collect_adapter.rs b/crates/python/rust/collect_adapter.rs
index d17fa26b..4ca70e09 100644
--- a/crates/python/rust/collect_adapter.rs
+++ b/crates/python/rust/collect_adapter.rs
@@ -202,25 +202,25 @@ pub fn _collect(
}
})
} else {
- return Err(PyErr::new::("must specify datatype or command"))
+ Err(PyErr::new::("must specify datatype or command"))
}
}
async fn run_collect(args: Args) -> PolarsResult {
let (query, source, _sink, _env) = match parse_args(&args).await {
Ok(opts) => opts,
- Err(e) => panic!("error parsing opts {:?}", e),
+ Err(e) => panic!("error parsing opts {e:?}"),
};
match collect(query.into(), source.into()).await {
Ok(df) => Ok(df),
- Err(e) => panic!("error collecting {:?}", e),
+ Err(e) => panic!("error collecting {e:?}"),
}
}
async fn run_execute(command: String) -> PolarsResult {
let args = match cryo_cli::parse_str(command.as_str()).await {
Ok(opts) => opts,
- Err(e) => panic!("error parsing opts {:?}", e),
+ Err(e) => panic!("error parsing opts {e:?}"),
};
run_collect(args).await
}
diff --git a/crates/python/rust/freeze_adapter.rs b/crates/python/rust/freeze_adapter.rs
index f40317a2..9d05234c 100644
--- a/crates/python/rust/freeze_adapter.rs
+++ b/crates/python/rust/freeze_adapter.rs
@@ -212,7 +212,7 @@ pub fn _freeze(
}
})
} else {
- return Err(PyErr::new::("must specify datatypes or command"))
+ Err(PyErr::new::("must specify datatypes or command"))
}
}
diff --git a/crates/to_df/src/lib.rs b/crates/to_df/src/lib.rs
index 6ab93323..36603b0d 100644
--- a/crates/to_df/src/lib.rs
+++ b/crates/to_df/src/lib.rs
@@ -209,7 +209,7 @@ pub fn to_df(attrs: TokenStream, input: TokenStream) -> TokenStream {
let field_name_str = format!("{}", quote!(#name));
column_types.push(quote! { (#field_name_str, #column_type) });
} else if name != "n_rows" && name != "event_cols" {
- println!("invalid column type for {name} in table {}", datatype_str);
+ println!("invalid column type for {name} in table {datatype_str}");
}
}