From 17e2f1a781e77e52225f0bb0b483acb41a988094 Mon Sep 17 00:00:00 2001 From: Andrew Fitzgerald Date: Thu, 6 Feb 2025 08:18:25 -0600 Subject: [PATCH] remove copy_return_values --- perf/src/sigverify.rs | 56 ------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/perf/src/sigverify.rs b/perf/src/sigverify.rs index 51290548152bcd..a83b283cf8eb7e 100644 --- a/perf/src/sigverify.rs +++ b/perf/src/sigverify.rs @@ -482,21 +482,6 @@ pub fn ed25519_verify_disabled(batches: &mut [PacketBatch]) { }); } -pub fn copy_return_values(sig_lens: I, out: &RecycledVec, rvs: &mut [Vec]) -where - I: IntoIterator, - T: IntoIterator, -{ - debug_assert!(rvs.iter().flatten().all(|&rv| rv == 0u8)); - let mut offset = 0usize; - let rvs = rvs.iter_mut().flatten(); - for (k, rv) in sig_lens.into_iter().flatten().zip(rvs) { - let out = out[offset..].iter().take(k as usize).all(|&x| x == 1u8); - *rv = u8::from(k != 0u32 && out); - offset = offset.saturating_add(k as usize); - } -} - pub fn mark_disabled(batches: &mut [PacketBatch], r: &[Vec]) { for (batch, v) in batches.iter_mut().zip(r) { for (pkt, f) in batch.iter_mut().zip(v) { @@ -533,7 +518,6 @@ mod tests { solana_signature::Signature, solana_signer::Signer, solana_transaction::Transaction, - std::iter::repeat_with, }; const SIG_OFFSET: usize = 1; @@ -544,46 +528,6 @@ mod tests { (0..end).find(|&i| a[i..i + b.len()] == b[..]) } - #[test] - fn test_copy_return_values() { - let mut rng = rand::thread_rng(); - let sig_lens: Vec> = { - let size = rng.gen_range(0..64); - repeat_with(|| { - let size = rng.gen_range(0..16); - repeat_with(|| rng.gen_range(0..5)).take(size).collect() - }) - .take(size) - .collect() - }; - let out: Vec>> = sig_lens - .iter() - .map(|sig_lens| { - sig_lens - .iter() - .map(|&size| repeat_with(|| rng.gen()).take(size as usize).collect()) - .collect() - }) - .collect(); - let expected: Vec> = out - .iter() - .map(|out| { - out.iter() - .map(|out| u8::from(!out.is_empty() && out.iter().all(|&k| k))) - .collect() - }) - .collect(); - let out = RecycledVec::::from_vec( - out.into_iter().flatten().flatten().map(u8::from).collect(), - ); - let mut rvs: Vec> = sig_lens - .iter() - .map(|sig_lens| vec![0u8; sig_lens.len()]) - .collect(); - copy_return_values(sig_lens, &out, &mut rvs); - assert_eq!(rvs, expected); - } - #[test] fn test_mark_disabled() { let batch_size = 1;