`test_verified_vote_packets_validator_gossip_votes_iterator_correct_fork` dynamic num validators (#30695)

Gossip vote test dynamic number of validators cleanup
This commit is contained in:
Brennan 2023-03-14 08:35:26 -07:00 committed by GitHub
parent 89d5efa0d8
commit 11c942ab40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 8 deletions

View File

@ -487,7 +487,7 @@ mod tests {
fn test_verified_vote_packets_validator_gossip_votes_iterator_correct_fork() { fn test_verified_vote_packets_validator_gossip_votes_iterator_correct_fork() {
let (s, r) = unbounded(); let (s, r) = unbounded();
let num_validators = 2; let num_validators = 2;
let vote_simulator = VoteSimulator::new(2); let vote_simulator = VoteSimulator::new(num_validators);
let mut my_leader_bank = vote_simulator.bank_forks.read().unwrap().root_bank(); let mut my_leader_bank = vote_simulator.bank_forks.read().unwrap().root_bank();
// Create a set of valid ancestor hashes for this fork // Create a set of valid ancestor hashes for this fork
@ -526,11 +526,9 @@ mod tests {
.receive_and_process_vote_packets(&r, true, None) .receive_and_process_vote_packets(&r, true, None)
.unwrap(); .unwrap();
// Check we get two batches, one for each validator. Each batch // One batch of vote packets per validator
// should only contain a packets structure with the specific number assert_eq!(verified_vote_packets.0.len(), num_validators);
// of packets associated with that batch // Each validator should have one vote per slot
assert_eq!(verified_vote_packets.0.len(), 2);
// Every validator should have `slot_hashes.slot_hashes().len()` votes
assert!(verified_vote_packets assert!(verified_vote_packets
.0 .0
.values() .values()
@ -544,8 +542,7 @@ mod tests {
); );
// Get and verify batches // Get and verify batches
let num_expected_batches = 2; for _ in 0..num_validators {
for _ in 0..num_expected_batches {
let validator_batch: Vec<PacketBatch> = gossip_votes_iterator.next().unwrap(); let validator_batch: Vec<PacketBatch> = gossip_votes_iterator.next().unwrap();
assert_eq!(validator_batch.len(), slot_hashes.slot_hashes().len()); assert_eq!(validator_batch.len(), slot_hashes.slot_hashes().len());
let expected_len = validator_batch[0].len(); let expected_len = validator_batch[0].len();