Skip to content

Commit 71c1ba1

Browse files
committed
fix: warnings about using 'std::slice::from_ref' instead of '&[T.clone()]'
1 parent f7e322c commit 71c1ba1

File tree

8 files changed

+48
-29
lines changed

8 files changed

+48
-29
lines changed

mithril-aggregator/src/http_server/validators/prover_transactions_hash_validator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ mod tests {
9696
for invalid_char in ["g", "x", ";", " ", "à"].iter() {
9797
let hash = format!("{}{}", "a".repeat(63), invalid_char);
9898
let error = ProverTransactionsHashValidator::default()
99-
.validate(&[hash.clone()])
99+
.validate(std::slice::from_ref(&hash))
100100
.expect_err("Should return an error");
101101
assert_eq!(
102102
error,

mithril-aggregator/src/services/message.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -621,7 +621,7 @@ mod tests {
621621
async fn get_certificate() {
622622
let genesis_certificate = fake_data::genesis_certificate("genesis_hash");
623623
let service = MessageServiceBuilder::new()
624-
.with_certificates(&[genesis_certificate.clone()])
624+
.with_certificates(std::slice::from_ref(&genesis_certificate))
625625
.build()
626626
.await;
627627

@@ -705,7 +705,7 @@ mod tests {
705705
let message: SnapshotMessage = record.clone().try_into().unwrap();
706706

707707
let service = MessageServiceBuilder::new()
708-
.with_signed_entity_records(&[record.clone()])
708+
.with_signed_entity_records(std::slice::from_ref(&record))
709709
.build()
710710
.await;
711711

@@ -778,7 +778,7 @@ mod tests {
778778
let message: CardanoDatabaseSnapshotMessage = record.clone().try_into().unwrap();
779779

780780
let service = MessageServiceBuilder::new()
781-
.with_signed_entity_records(&[record.clone()])
781+
.with_signed_entity_records(std::slice::from_ref(&record))
782782
.build()
783783
.await;
784784

@@ -869,7 +869,7 @@ mod tests {
869869
let message: MithrilStakeDistributionMessage = record.clone().try_into().unwrap();
870870

871871
let service = MessageServiceBuilder::new()
872-
.with_signed_entity_records(&[record.clone()])
872+
.with_signed_entity_records(std::slice::from_ref(&record))
873873
.build()
874874
.await;
875875

@@ -949,7 +949,7 @@ mod tests {
949949
let message: CardanoTransactionSnapshotMessage = record.clone().try_into().unwrap();
950950

951951
let service = MessageServiceBuilder::new()
952-
.with_signed_entity_records(&[record.clone()])
952+
.with_signed_entity_records(std::slice::from_ref(&record))
953953
.build()
954954
.await;
955955

@@ -1028,7 +1028,7 @@ mod tests {
10281028
let message: CardanoStakeDistributionMessage = record.clone().try_into().unwrap();
10291029

10301030
let service = MessageServiceBuilder::new()
1031-
.with_signed_entity_records(&[record.clone()])
1031+
.with_signed_entity_records(std::slice::from_ref(&record))
10321032
.build()
10331033
.await;
10341034

@@ -1066,7 +1066,7 @@ mod tests {
10661066
let message: CardanoStakeDistributionMessage = record.clone().try_into().unwrap();
10671067

10681068
let service = MessageServiceBuilder::new()
1069-
.with_signed_entity_records(&[record.clone()])
1069+
.with_signed_entity_records(std::slice::from_ref(&record))
10701070
.build()
10711071
.await;
10721072

mithril-aggregator/tests/prove_transactions.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ async fn prove_transactions() {
115115
let proof_for_last_transaction = prover
116116
.compute_transactions_proofs(
117117
last_tx_snapshot.artifact.block_number,
118-
&[last_transaction_hash.clone()],
118+
std::slice::from_ref(&last_transaction_hash),
119119
)
120120
.await
121121
.unwrap()

mithril-client-cli/src/utils/feedback_receiver.rs

Lines changed: 26 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,8 @@ mod tests {
421421
#[tokio::test]
422422
async fn starting_full_immutables_and_ancillary_together_spawn_two_progress_bars() {
423423
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
424-
let sender = FeedbackSender::new(&[receiver.clone()]);
424+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
425+
let sender = FeedbackSender::new(&[receiver_clone]);
425426

426427
send_event!(cardano_db_v1, full_immutables_dl, started => sender, digest:"digest", size:123);
427428
send_event!(cardano_db_v1, ancillary_dl, started => sender, size:456);
@@ -433,7 +434,8 @@ mod tests {
433434
#[tokio::test]
434435
async fn start_and_progress_ancillary_download_with_a_size_of_zero_should_not_crash() {
435436
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
436-
let sender = FeedbackSender::new(&[receiver.clone()]);
437+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
438+
let sender = FeedbackSender::new(&[receiver_clone]);
437439

438440
send_event!(cardano_db_v1, ancillary_dl, started => sender, size:0);
439441
send_event!(cardano_db_v1, ancillary_dl, progress => sender, bytes:124, size:0);
@@ -444,7 +446,8 @@ mod tests {
444446
#[tokio::test]
445447
async fn start_then_complete_should_remove_immutables_progress_bar() {
446448
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
447-
let sender = FeedbackSender::new(&[receiver.clone()]);
449+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
450+
let sender = FeedbackSender::new(&[receiver_clone]);
448451

449452
send_event!(cardano_db_v1, full_immutables_dl, started => sender, digest:"digest", size:123);
450453
send_event!(cardano_db_v1, full_immutables_dl, completed => sender);
@@ -455,7 +458,8 @@ mod tests {
455458
#[tokio::test]
456459
async fn start_then_complete_should_remove_ancillary_progress_bar() {
457460
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
458-
let sender = FeedbackSender::new(&[receiver.clone()]);
461+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
462+
let sender = FeedbackSender::new(&[receiver_clone]);
459463

460464
send_event!(cardano_db_v1, ancillary_dl, started => sender, size:456);
461465
send_event!(cardano_db_v1, ancillary_dl, completed => sender);
@@ -470,7 +474,8 @@ mod tests {
470474
#[tokio::test]
471475
async fn starting_should_add_multi_progress_bar() {
472476
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
473-
let sender = FeedbackSender::new(&[receiver.clone()]);
477+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
478+
let sender = FeedbackSender::new(&[receiver_clone]);
474479

475480
send_event!(cardano_db, dl_started => sender, total:99, ancillary:false);
476481

@@ -480,7 +485,8 @@ mod tests {
480485
#[tokio::test]
481486
async fn start_then_complete_should_remove_multi_progress_bar() {
482487
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
483-
let sender = FeedbackSender::new(&[receiver.clone()]);
488+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
489+
let sender = FeedbackSender::new(&[receiver_clone]);
484490

485491
send_event!(cardano_db, dl_started => sender, total:99, ancillary:false);
486492
send_event!(cardano_db, dl_completed => sender);
@@ -491,7 +497,8 @@ mod tests {
491497
#[tokio::test]
492498
async fn start_including_ancillary_add_one_to_total_downloads() {
493499
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
494-
let sender = FeedbackSender::new(&[receiver.clone()]);
500+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
501+
let sender = FeedbackSender::new(&[receiver_clone]);
495502

496503
send_event!(cardano_db, dl_started => sender, total:99, ancillary:true);
497504

@@ -509,7 +516,8 @@ mod tests {
509516
#[tokio::test]
510517
async fn starting_twice_should_supersede_first_multi_progress_bar() {
511518
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
512-
let sender = FeedbackSender::new(&[receiver.clone()]);
519+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
520+
let sender = FeedbackSender::new(&[receiver_clone]);
513521

514522
send_event!(cardano_db, dl_started => sender, total:50, ancillary:false);
515523
send_event!(cardano_db, dl_started => sender, total:99, ancillary:false);
@@ -528,15 +536,17 @@ mod tests {
528536
#[tokio::test]
529537
async fn complete_without_start_should_not_panic() {
530538
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
531-
let sender = FeedbackSender::new(&[receiver.clone()]);
539+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
540+
let sender = FeedbackSender::new(&[receiver_clone]);
532541

533542
send_event!(cardano_db, dl_completed => sender);
534543
}
535544

536545
#[tokio::test]
537546
async fn starting_immutable_downloads_should_not_add_progress_bars() {
538547
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
539-
let sender = FeedbackSender::new(&[receiver.clone()]);
548+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
549+
let sender = FeedbackSender::new(&[receiver_clone]);
540550

541551
send_event!(cardano_db, dl_started => sender, total:50, ancillary:false);
542552

@@ -551,7 +561,8 @@ mod tests {
551561
#[tokio::test]
552562
async fn completed_immutable_downloads_bump_progress() {
553563
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
554-
let sender = FeedbackSender::new(&[receiver.clone()]);
564+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
565+
let sender = FeedbackSender::new(&[receiver_clone]);
555566

556567
send_event!(cardano_db, dl_started => sender, total:50, ancillary:false);
557568

@@ -566,7 +577,8 @@ mod tests {
566577
#[tokio::test]
567578
async fn starting_digests_downloads_should_not_add_progress_bars() {
568579
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
569-
let sender = FeedbackSender::new(&[receiver.clone()]);
580+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
581+
let sender = FeedbackSender::new(&[receiver_clone]);
570582

571583
send_event!(cardano_db, dl_started => sender, total:50, ancillary:false);
572584

@@ -581,7 +593,8 @@ mod tests {
581593
#[tokio::test]
582594
async fn starting_ancillary_downloads_should_add_a_progress_bar() {
583595
let receiver = build_feedback_receiver(ProgressOutputType::Hidden);
584-
let sender = FeedbackSender::new(&[receiver.clone()]);
596+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
597+
let sender = FeedbackSender::new(&[receiver_clone]);
585598

586599
send_event!(cardano_db, dl_started => sender, total:50, ancillary:false);
587600

mithril-client/src/feedback.rs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,8 @@ mod tests {
590590
#[tokio::test]
591591
async fn send_event_same_thread() {
592592
let receiver = Arc::new(StackFeedbackReceiver::new());
593-
let sender = FeedbackSender::new(&[receiver.clone()]);
593+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
594+
let sender = FeedbackSender::new(&[receiver_clone]);
594595

595596
sender
596597
.send_event(SnapshotDownloadStarted {
@@ -716,8 +717,9 @@ mod tests {
716717
#[tokio::test]
717718
async fn send_event_in_one_thread_and_receive_in_another_thread() {
718719
let receiver = Arc::new(StackFeedbackReceiver::new());
720+
let receiver_clone = receiver.clone() as Arc<dyn FeedbackReceiver>;
719721
let receiver2 = receiver.clone();
720-
let sender = FeedbackSender::new(&[receiver.clone()]);
722+
let sender = FeedbackSender::new(&[receiver_clone]);
721723
let mut join_set = JoinSet::new();
722724

723725
join_set.spawn(async move {

mithril-client/src/file_downloader/http.rs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,9 @@ mod tests {
245245
use mithril_common::{entities::FileUri, test::TempDir};
246246

247247
use crate::{
248-
feedback::{MithrilEvent, MithrilEventCardanoDatabase, StackFeedbackReceiver},
248+
feedback::{
249+
FeedbackReceiver, MithrilEvent, MithrilEventCardanoDatabase, StackFeedbackReceiver,
250+
},
249251
test_utils::TestLogger,
250252
};
251253

@@ -288,8 +290,9 @@ mod tests {
288290
.header(reqwest::header::CONTENT_LENGTH.as_str(), size.to_string());
289291
});
290292
let feedback_receiver = Arc::new(StackFeedbackReceiver::new());
293+
let feedback_receiver_clone = feedback_receiver.clone() as Arc<dyn FeedbackReceiver>;
291294
let http_file_downloader = HttpFileDownloader::new(
292-
FeedbackSender::new(&[feedback_receiver.clone()]),
295+
FeedbackSender::new(&[feedback_receiver_clone]),
293296
TestLogger::stdout(),
294297
)
295298
.unwrap();
@@ -339,8 +342,9 @@ mod tests {
339342
file.write_all(content.as_bytes()).unwrap();
340343

341344
let feedback_receiver = Arc::new(StackFeedbackReceiver::new());
345+
let feedback_receiver_clone = feedback_receiver.clone() as Arc<dyn FeedbackReceiver>;
342346
let http_file_downloader = HttpFileDownloader::new(
343-
FeedbackSender::new(&[feedback_receiver.clone()]),
347+
FeedbackSender::new(&[feedback_receiver_clone]),
344348
TestLogger::stdout(),
345349
)
346350
.unwrap();

mithril-common/src/test/double/certificate_retriever.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ mod tests {
5353
let certificate = fake_data::certificate("certificate-hash-123".to_string());
5454
let certificate_hash = certificate.hash.clone();
5555
let certificate_retriever =
56-
FakeCertificaterRetriever::from_certificates(&[certificate.clone()]);
56+
FakeCertificaterRetriever::from_certificates(std::slice::from_ref(&certificate));
5757

5858
let retrieved_certificate = certificate_retriever
5959
.get_certificate_details(&certificate_hash)

mithril-test-lab/mithril-end-to-end/src/stress_test/fake_signer.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ pub async fn try_register_signer_until_registration_round_is_open(
7373
timeout: Duration,
7474
) -> StdResult<()> {
7575
let mut register_message =
76-
payload_builder::generate_register_signer_message(&[signer.clone()], epoch);
76+
payload_builder::generate_register_signer_message(std::slice::from_ref(signer), epoch);
7777
let register_message = register_message.swap_remove(0);
7878
let party_id = register_message.party_id.clone();
7979

0 commit comments

Comments
 (0)