blockworks-foundation
/
solana
mirror of https://github.com/blockworks-foundation/solana.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update test_banking_stage_entryfication to be more deterministic (#25146) 

* Update test_banking_stage_entryfication to be more deterministic

* revert to original test with updated checks
This commit is contained in:
Pankaj Garg 2022-05-12 08:36:19 -07:00 committed by GitHub
parent abb4993a3b
commit bcf4d54235
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
core/src/banking_stage.rs
View File

@ -2468,7 +2468,29 @@ mod tests {
} = create_slow_genesis_config(2); } = create_slow_genesis_config(2);
let (verified_sender, verified_receiver) = unbounded(); let (verified_sender, verified_receiver) = unbounded();
// Process a batch that includes a transaction that receives two lamports.
let alice = Keypair::new(); let alice = Keypair::new();
let tx =
system_transaction::transfer(&mint_keypair, &alice.pubkey(), 2, genesis_config.hash());
let packet_batches = to_packet_batches(&[tx], 1);
let packet_batches = packet_batches
.into_iter()
.map(|batch| (batch, vec![1u8]))
.collect();
let packet_batches = convert_from_old_verified(packet_batches);
verified_sender.send(packet_batches).unwrap();
// Process a second batch that uses the same from account, so conflicts with above TX
let tx =
system_transaction::transfer(&mint_keypair, &alice.pubkey(), 1, genesis_config.hash());
let packet_batches = to_packet_batches(&[tx], 1);
let packet_batches = packet_batches
.into_iter()
.map(|batch| (batch, vec![1u8]))
.collect();
let packet_batches = convert_from_old_verified(packet_batches);
verified_sender.send(packet_batches).unwrap();
let (vote_sender, vote_receiver) = unbounded(); let (vote_sender, vote_receiver) = unbounded();
let (tpu_vote_sender, tpu_vote_receiver) = unbounded(); let (tpu_vote_sender, tpu_vote_receiver) = unbounded();
@ -2505,41 +2527,9 @@ mod tests {
Arc::new(RwLock::new(CostModel::default())), Arc::new(RwLock::new(CostModel::default())),
); );
// Process a batch that includes a transaction that receives two lamports.
let tx = system_transaction::transfer(
&mint_keypair,
&alice.pubkey(),
2,
genesis_config.hash(),
);
let packet_batches = to_packet_batches(&[tx], 1);
let packet_batches = packet_batches
.into_iter()
.map(|batch| (batch, vec![1u8]))
.collect();
let packet_batches = convert_from_old_verified(packet_batches);
verified_sender.send(packet_batches).unwrap();
sleep(Duration::from_millis(200));
// Process a second batch that uses the same from account, so conflicts with above TX
let tx = system_transaction::transfer(
&mint_keypair,
&alice.pubkey(),
1,
genesis_config.hash(),
);
let packet_batches = to_packet_batches(&[tx], 1);
let packet_batches = packet_batches
.into_iter()
.map(|batch| (batch, vec![1u8]))
.collect();
let packet_batches = convert_from_old_verified(packet_batches);
verified_sender.send(packet_batches).unwrap();
// wait for banking_stage to eat the packets // wait for banking_stage to eat the packets
while bank.get_balance(&alice.pubkey()) < 2 { while bank.get_balance(&alice.pubkey()) < 1 {
sleep(Duration::from_millis(100)); sleep(Duration::from_millis(10));
} }
exit.store(true, Ordering::Relaxed); exit.store(true, Ordering::Relaxed);
poh_service.join().unwrap(); poh_service.join().unwrap();
@ -2563,10 +2553,10 @@ mod tests {
.for_each(|x| assert_eq!(*x, Ok(()))); .for_each(|x| assert_eq!(*x, Ok(())));
} }
// Assert the user holds two lamports, not three. If the stage only outputs one // Assert the user doesn't hold three lamports. If the stage only outputs one
// entry, then the second transaction will be rejected, because it drives // entry, then one of the transactions will be rejected, because it drives
// the account balance below zero before the credit is added. // the account balance below zero before the credit is added.
assert_eq!(bank.get_balance(&alice.pubkey()), 2); assert!(bank.get_balance(&alice.pubkey()) != 3);
} }
Blockstore::destroy(ledger_path.path()).unwrap(); Blockstore::destroy(ledger_path.path()).unwrap();
} }