Skip to content

Commit

Permalink
remove copy_return_values
Browse files Browse the repository at this point in the history
  • Loading branch information
apfitzge committed Feb 6, 2025
1 parent 0219743 commit 17e2f1a
Showing 1 changed file with 0 additions and 56 deletions.
56 changes: 0 additions & 56 deletions perf/src/sigverify.rs
Original file line number Diff line number Diff line change
Expand Up @@ -482,21 +482,6 @@ pub fn ed25519_verify_disabled(batches: &mut [PacketBatch]) {
});
}

pub fn copy_return_values<I, T>(sig_lens: I, out: &RecycledVec<u8>, rvs: &mut [Vec<u8>])
where
I: IntoIterator<Item = T>,
T: IntoIterator<Item = u32>,
{
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<u8>]) {
for (batch, v) in batches.iter_mut().zip(r) {
for (pkt, f) in batch.iter_mut().zip(v) {
Expand Down Expand Up @@ -533,7 +518,6 @@ mod tests {
solana_signature::Signature,
solana_signer::Signer,
solana_transaction::Transaction,
std::iter::repeat_with,
};

const SIG_OFFSET: usize = 1;
Expand All @@ -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<Vec<u32>> = {
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<Vec<Vec<bool>>> = 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<Vec<u8>> = out
.iter()
.map(|out| {
out.iter()
.map(|out| u8::from(!out.is_empty() && out.iter().all(|&k| k)))
.collect()
})
.collect();
let out = RecycledVec::<u8>::from_vec(
out.into_iter().flatten().flatten().map(u8::from).collect(),
);
let mut rvs: Vec<Vec<u8>> = 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;
Expand Down

0 comments on commit 17e2f1a

Please sign in to comment.