refactor: use less &mut self and more async-await in BanksClient (sol…

…ana-labs#2591)

* refactor: use less &mut self in BanksClient

* refactor: use async-await syntax instead of explicit Futures

program-test/tests/bpf.rs

@@ -14,7 +14,7 @@ async fn test_add_bpf_program() {
     program_test.prefer_bpf(true);
     program_test.add_program("noop_program", program_id, None);
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
 
     // Assert the program is a BPF Loader 2 program.
     let program_account = context

program-test/tests/builtins.rs

@@ -13,7 +13,7 @@ use {
 #[tokio::test]
 async fn test_bpf_loader_upgradeable_present() {
     // Arrange
-    let (mut banks_client, payer, recent_blockhash) = ProgramTest::default().start().await;
+    let (banks_client, payer, recent_blockhash) = ProgramTest::default().start().await;
 
     let buffer_keypair = Keypair::new();
     let upgrade_authority_keypair = Keypair::new();
@@ -50,7 +50,7 @@ async fn test_bpf_loader_upgradeable_present() {
 #[tokio::test]
 async fn versioned_transaction() {
     let program_test = ProgramTest::default();
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
 
     let program_id = Pubkey::new_unique();
     let account = Keypair::new();

program-test/tests/compute_units.rs

@@ -20,7 +20,7 @@ fn overflow_compute_units() {
 async fn max_compute_units() {
     let mut program_test = ProgramTest::default();
     program_test.set_compute_max_units(i64::MAX as u64);
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
 
     // Invalid compute unit maximums are only triggered by BPF programs, so send
     // a valid instruction into a BPF program to make sure the issue doesn't

program-test/tests/core_bpf.rs

@@ -14,7 +14,7 @@ async fn test_add_bpf_program() {
     let mut program_test = ProgramTest::default();
     program_test.add_upgradeable_program_to_genesis("noop_program", &program_id);
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
 
     // Assert the program is a BPF Loader Upgradeable program.
     let program_account = context

program-test/tests/cpi.rs

@@ -129,7 +129,7 @@ async fn cpi() {
         processor!(invoked_process_instruction),
     );
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let instructions = vec![Instruction::new_with_bincode(
         invoker_program_id,
         &[0],
@@ -165,7 +165,7 @@ async fn cpi_dupes() {
         processor!(invoked_process_instruction),
     );
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let instructions = vec![Instruction::new_with_bincode(
         invoker_program_id,
         &[0],
@@ -201,7 +201,7 @@ async fn cpi_create_account() {
     );
 
     let create_account_keypair = Keypair::new();
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let instructions = vec![Instruction::new_with_bincode(
         create_account_program_id,
         &[0],
@@ -272,7 +272,7 @@ async fn stack_height() {
         processor!(invoked_stack_height),
     );
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let instructions = vec![Instruction::new_with_bytes(
         invoker_stack_height_program_id,
         &[],

program-test/tests/genesis_accounts.rs

@@ -30,7 +30,7 @@ async fn genesis_accounts() {
         program_test.add_genesis_account(*pubkey, account.clone());
     }
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
 
     // Verify the accounts are present.
     for (pubkey, account) in my_genesis_accounts.iter() {

program-test/tests/lamports.rs

@@ -42,7 +42,7 @@ async fn move_lamports() {
 
     let lamports = 1_000_000_000;
     let source = Keypair::new();
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let instructions = vec![
         system_instruction::create_account(
             &context.payer.pubkey(),

program-test/tests/realloc.rs

@@ -50,7 +50,7 @@ async fn realloc_smaller_in_cpi() {
         program_id,
         processor!(process_instruction),
     );
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
 
     let token_2022_id = solana_inline_spl::token_2022::id();
     let mint = Keypair::new();

program-test/tests/return_data.rs

@@ -69,7 +69,7 @@ async fn return_data() {
         processor!(set_return_data_process_instruction),
     );
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let instructions = vec![Instruction {
         program_id: get_return_data_program_id,
         accounts: vec![AccountMeta::new_readonly(set_return_data_program_id, false)],
@@ -109,7 +109,7 @@ async fn simulation_return_data() {
         processor!(error_set_return_data_process_instruction),
     );
 
-    let mut context = program_test.start_with_context().await;
+    let context = program_test.start_with_context().await;
     let expected_data = vec![240, 159, 166, 150];
     let instructions = vec![Instruction {
         program_id: error_set_return_data_program_id,

program-test/tests/spl.rs

@@ -14,7 +14,7 @@ use {
 
 #[tokio::test]
 async fn programs_present() {
-    let (mut banks_client, _, _) = ProgramTest::default().start().await;
+    let (banks_client, _, _) = ProgramTest::default().start().await;
     let rent = banks_client.get_rent().await.unwrap();
     let token_2022_id = solana_inline_spl::token_2022::id();
     let (token_2022_programdata_id, _) =
@@ -32,7 +32,7 @@ async fn programs_present() {
 
 #[tokio::test]
 async fn token_2022() {
-    let (mut banks_client, payer, recent_blockhash) = ProgramTest::default().start().await;
+    let (banks_client, payer, recent_blockhash) = ProgramTest::default().start().await;
 
     let token_2022_id = solana_inline_spl::token_2022::id();
     let mint = Keypair::new();

tpu-client/src/nonblocking/tpu_client.rs

@@ -3,7 +3,7 @@ use {
     crate::tpu_client::{RecentLeaderSlots, TpuClientConfig, MAX_FANOUT_SLOTS},
     bincode::serialize,
     futures_util::{
-        future::{join_all, FutureExt, TryFutureExt},
+        future::{join_all, FutureExt},
         stream::StreamExt,
     },
     log::*,
@@ -308,11 +308,12 @@ where
 //
 // Useful for end-users who don't need a persistent connection to each validator,
 // and want to abort more quickly.
-fn timeout_future<'a, Fut: Future<Output = TransportResult<()>> + 'a>(
+async fn timeout_future<Fut: Future<Output = TransportResult<()>>>(
     timeout_duration: Duration,
     future: Fut,
-) -> impl Future<Output = TransportResult<()>> + 'a {
+) -> TransportResult<()> {
     timeout(timeout_duration, future)
+        .await
         .unwrap_or_else(|_| Err(TransportError::Custom("Timed out".to_string())))
 }