Skip to content

Commit 222b7c6

Browse files
committed
chore: cargo clippy
1 parent 446c4a7 commit 222b7c6

File tree

2 files changed

+13
-18
lines changed

2 files changed

+13
-18
lines changed

batcher/aligned-sdk/src/communication/messaging.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ pub async fn send_messages(
8383
let sent_verification_data_rev: Vec<Result<NoncedVerificationData, SubmitError>> =
8484
sent_verification_data
8585
.into_iter()
86-
.map(|vd| vd.into())
8786
.rev()
8887
.collect();
8988
sent_verification_data_rev
@@ -296,11 +295,9 @@ fn get_biggest_nonce(
296295
sent_verification_data: &[Result<NoncedVerificationData, SubmitError>],
297296
) -> U256 {
298297
let mut biggest_nonce = U256::zero();
299-
for verification_data in sent_verification_data.iter() {
300-
if let Ok(verification_data) = verification_data {
301-
if verification_data.nonce > biggest_nonce {
302-
biggest_nonce = verification_data.nonce;
303-
}
298+
for verification_data in sent_verification_data.iter().flatten() {
299+
if verification_data.nonce > biggest_nonce {
300+
biggest_nonce = verification_data.nonce;
304301
}
305302
}
306303
biggest_nonce

batcher/aligned-sdk/src/sdk.rs

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -99,14 +99,12 @@ pub async fn submit_multiple_and_wait_verification(
9999
// TODO: open issue: use a join to .await all at the same time, avoiding the loop
100100
// And await only once per batch, no need to await multiple proofs if they are in the same batch.
101101
let mut error_awaiting_batch_verification: Option<errors::SubmitError> = None;
102-
for aligned_verification_data_item in aligned_verification_data.iter() {
103-
if let Ok(aligned_verification_data_item) = aligned_verification_data_item {
104-
if let Err(e) =
105-
await_batch_verification(aligned_verification_data_item, eth_rpc_url, network).await
106-
{
107-
error_awaiting_batch_verification = Some(e);
108-
break;
109-
}
102+
for aligned_verification_data_item in aligned_verification_data.iter().flatten() {
103+
if let Err(e) =
104+
await_batch_verification(aligned_verification_data_item, eth_rpc_url, network).await
105+
{
106+
error_awaiting_batch_verification = Some(e);
107+
break;
110108
}
111109
}
112110
if let Some(error_awaiting_batch_verification) = error_awaiting_batch_verification {
@@ -404,7 +402,7 @@ pub async fn submit_and_wait_verification(
404402
)
405403
.await;
406404

407-
match aligned_verification_data.get(0) {
405+
match aligned_verification_data.first() {
408406
Some(Ok(aligned_verification_data)) => Ok(aligned_verification_data.clone()),
409407
Some(Err(e)) => Err(errors::SubmitError::GenericError(e.to_string())),
410408
None => Err(errors::SubmitError::GenericError(
@@ -459,7 +457,7 @@ pub async fn submit(
459457
)
460458
.await;
461459

462-
match aligned_verification_data.get(0) {
460+
match aligned_verification_data.first() {
463461
Some(Ok(aligned_verification_data)) => Ok(aligned_verification_data.clone()),
464462
Some(Err(e)) => Err(errors::SubmitError::GenericError(e.to_string())),
465463
None => Err(errors::SubmitError::GenericError(
@@ -719,7 +717,7 @@ fn save_response_cbor(
719717

720718
let data = cbor_serialize(&aligned_verification_data)?;
721719

722-
let mut file = File::create(&batch_inclusion_data_path)?;
720+
let mut file = File::create(batch_inclusion_data_path)?;
723721
file.write_all(data.as_slice())?;
724722

725723
Ok(())
@@ -753,7 +751,7 @@ fn save_response_json(
753751
"verification_data_batch_index": aligned_verification_data.index_in_batch,
754752
"merkle_proof": merkle_proof,
755753
});
756-
let mut file = File::create(&batch_inclusion_data_path)?;
754+
let mut file = File::create(batch_inclusion_data_path)?;
757755
file.write_all(serde_json::to_string_pretty(&data).unwrap().as_bytes())?;
758756

759757
Ok(())

0 commit comments

Comments
 (0)