diff --git a/banks-client/src/lib.rs b/banks-client/src/lib.rs index 83c2c9e06e..88eae58481 100644 --- a/banks-client/src/lib.rs +++ b/banks-client/src/lib.rs @@ -369,7 +369,9 @@ mod tests { let message = Message::new(&[instruction], Some(&mint_pubkey)); Runtime::new()?.block_on(async { - let client_transport = start_local_server(bank_forks, block_commitment_cache).await; + let client_transport = + start_local_server(bank_forks, block_commitment_cache, Duration::from_millis(1)) + .await; let mut banks_client = start_client(client_transport).await?; let recent_blockhash = banks_client.get_recent_blockhash().await?; @@ -400,7 +402,9 @@ mod tests { let message = Message::new(&[instruction], Some(mint_pubkey)); Runtime::new()?.block_on(async { - let client_transport = start_local_server(bank_forks, block_commitment_cache).await; + let client_transport = + start_local_server(bank_forks, block_commitment_cache, Duration::from_millis(1)) + .await; let mut banks_client = start_client(client_transport).await?; let (_, recent_blockhash, last_valid_block_height) = banks_client.get_fees().await?; let transaction = Transaction::new(&[&genesis.mint_keypair], message, recent_blockhash); diff --git a/banks-server/src/banks_server.rs b/banks-server/src/banks_server.rs index 603748838e..38f046d481 100644 --- a/banks-server/src/banks_server.rs +++ b/banks-server/src/banks_server.rs @@ -47,6 +47,7 @@ struct BanksServer { bank_forks: Arc>, block_commitment_cache: Arc>, transaction_sender: Sender, + poll_signature_status_sleep_duration: Duration, } impl BanksServer { @@ -58,11 +59,13 @@ impl BanksServer { bank_forks: Arc>, block_commitment_cache: Arc>, transaction_sender: Sender, + poll_signature_status_sleep_duration: Duration, ) -> Self { Self { bank_forks, block_commitment_cache, transaction_sender, + poll_signature_status_sleep_duration, } } @@ -85,6 +88,7 @@ impl BanksServer { fn new_loopback( bank_forks: Arc>, block_commitment_cache: Arc>, + poll_signature_status_sleep_duration: Duration, ) -> Self { let (transaction_sender, transaction_receiver) = channel(); let bank = bank_forks.read().unwrap().working_bank(); @@ -99,7 +103,12 @@ impl BanksServer { .name("solana-bank-forks-client".to_string()) .spawn(move || Self::run(server_bank_forks, transaction_receiver)) .unwrap(); - Self::new(bank_forks, block_commitment_cache, transaction_sender) + Self::new( + bank_forks, + block_commitment_cache, + transaction_sender, + poll_signature_status_sleep_duration, + ) } fn slot(&self, commitment: CommitmentLevel) -> Slot { @@ -124,7 +133,7 @@ impl BanksServer { .bank(commitment) .get_signature_status_with_blockhash(signature, blockhash); while status.is_none() { - sleep(Duration::from_millis(200)).await; + sleep(self.poll_signature_status_sleep_duration).await; let bank = self.bank(commitment); if bank.block_height() > last_valid_block_height { break; @@ -270,8 +279,13 @@ impl Banks for BanksServer { pub async fn start_local_server( bank_forks: Arc>, block_commitment_cache: Arc>, + poll_signature_status_sleep_duration: Duration, ) -> UnboundedChannel, ClientMessage> { - let banks_server = BanksServer::new_loopback(bank_forks, block_commitment_cache); + let banks_server = BanksServer::new_loopback( + bank_forks, + block_commitment_cache, + poll_signature_status_sleep_duration, + ); let (client_transport, server_transport) = transport::channel::unbounded(); let server = server::BaseChannel::with_defaults(server_transport).execute(banks_server.serve()); tokio::spawn(server); @@ -311,8 +325,12 @@ pub async fn start_tcp_server( 0, ); - let server = - BanksServer::new(bank_forks.clone(), block_commitment_cache.clone(), sender); + let server = BanksServer::new( + bank_forks.clone(), + block_commitment_cache.clone(), + sender, + Duration::from_millis(200), + ); chan.execute(server.serve()) }) // Max 10 channels. diff --git a/program-test/src/lib.rs b/program-test/src/lib.rs index bd4e2d05d0..ad17c37504 100644 --- a/program-test/src/lib.rs +++ b/program-test/src/lib.rs @@ -32,6 +32,7 @@ use { instruction::InstructionError, message::Message, native_token::sol_to_lamports, + poh_config::PohConfig, process_instruction::{stable_log, InvokeContext, ProcessInstructionWithContext}, program_error::{ProgramError, ACCOUNT_BORROW_FAILED, UNSUPPORTED_SYSVAR}, pubkey::Pubkey, @@ -756,7 +757,7 @@ impl ProgramTest { let mint_keypair = Keypair::new(); let voting_keypair = Keypair::new(); - let genesis_config = create_genesis_config_with_leader_ex( + let mut genesis_config = create_genesis_config_with_leader_ex( sol_to_lamports(1_000_000.0), &mint_keypair.pubkey(), &bootstrap_validator_pubkey, @@ -769,6 +770,8 @@ impl ProgramTest { ClusterType::Development, vec![], ); + let target_tick_duration = Duration::from_micros(100); + genesis_config.poh_config = PohConfig::new_sleep(target_tick_duration); debug!("Payer address: {}", mint_keypair.pubkey()); debug!("Genesis config: {}", genesis_config); @@ -838,8 +841,13 @@ impl ProgramTest { pub async fn start(self) -> (BanksClient, Keypair, Hash) { let (bank_forks, block_commitment_cache, last_blockhash, gci) = self.setup_bank(); - let transport = - start_local_server(bank_forks.clone(), block_commitment_cache.clone()).await; + let target_tick_duration = gci.genesis_config.poh_config.target_tick_duration; + let transport = start_local_server( + bank_forks.clone(), + block_commitment_cache.clone(), + target_tick_duration, + ) + .await; let banks_client = start_client(transport) .await .unwrap_or_else(|err| panic!("Failed to start banks client: {}", err)); @@ -847,7 +855,6 @@ impl ProgramTest { // Run a simulated PohService to provide the client with new blockhashes. New blockhashes // are required when sending multiple otherwise identical transactions in series from a // test - let target_tick_duration = gci.genesis_config.poh_config.target_tick_duration; tokio::spawn(async move { loop { bank_forks @@ -868,8 +875,13 @@ impl ProgramTest { /// with SOL for sending transactions pub async fn start_with_context(self) -> ProgramTestContext { let (bank_forks, block_commitment_cache, last_blockhash, gci) = self.setup_bank(); - let transport = - start_local_server(bank_forks.clone(), block_commitment_cache.clone()).await; + let target_tick_duration = gci.genesis_config.poh_config.target_tick_duration; + let transport = start_local_server( + bank_forks.clone(), + block_commitment_cache.clone(), + target_tick_duration, + ) + .await; let banks_client = start_client(transport) .await .unwrap_or_else(|err| panic!("Failed to start banks client: {}", err));