gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle already discarded packets in discard_excess_packets (#22594)

Browse Source 
(cherry picked from commit 38b02bbcc0)
This commit is contained in:
sakridge
2022-01-21 08:22:50 -08:00
committed by mergify-bot
parent 2ddb5b27c1
commit 63d969d89b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/sigverify_stage.rs
View File

@ -196,6 +196,7 @@ impl SigVerifyStage {
.iter_mut()
.rev()
.flat_map(|batch| batch.packets.iter_mut().rev())
.filter(|packet| !packet.meta.discard())
.map(|packet| (packet.meta.addr, packet))
.into_group_map();
// Allocate max_packets evenly across addresses.
@ -373,11 +374,14 @@ mod tests {
let mut batch = PacketBatch::default();
batch.packets.resize(10, Packet::default());
batch.packets[3].meta.addr = std::net::IpAddr::from([1u16; 8]);
batch.packets[3].meta.set_discard(true);
batch.packets[4].meta.addr = std::net::IpAddr::from([2u16; 8]);
let mut batches = vec![batch];
let max = 3;
SigVerifyStage::discard_excess_packets(&mut batches, max);
assert_eq!(count_non_discard(&batches), max);
assert!(!batches[0].packets[0].meta.discard());
assert!(!batches[0].packets[3].meta.discard());
assert!(batches[0].packets[3].meta.discard());
assert!(!batches[0].packets[4].meta.discard());
}
}