Adapt to solana-labs/solana#13355

mvines · Nov 3, 2020 · 357298a · 357298a
1 parent d0ef13c
commit 357298a
Showing 1 changed file with 32 additions and 10 deletions.
diff --git a/associated-account/program/tests/functional.rs b/associated-account/program/tests/functional.rs
@@ -1,6 +1,4 @@
-use solana_program::{
-    instruction::*, program_pack::Pack, pubkey::Pubkey, system_instruction, sysvar::rent::Rent,
-};
+use solana_program::{instruction::*, program_pack::Pack, pubkey::Pubkey, system_instruction};
 use solana_program_test::*;
 use solana_sdk::{
     signature::Signer,
@@ -55,9 +53,13 @@ async fn test_associated_token_account() {
     let associated_token_account =
         get_associated_token_address(&user_wallet_address, &token_mint_address);
 
-    let (mut banks_client, payer, recent_blockhash) =
-        program_test_with_mint(token_mint_address).start().await;
-    let rent = Rent::default(); // <-- TOOD: get Rent from `ProgramTest`
+    let StartOutputs {
+        mut banks_client,
+        payer,
+        recent_blockhash,
+        rent,
+        ..
+    } = program_test_with_mint(token_mint_address).start().await;
 
     // Associated account does not exist
     assert_eq!(
@@ -99,7 +101,12 @@ async fn test_associated_token_account() {
 
 #[tokio::test]
 async fn test_invalid_instruction_data() {
-    let (mut banks_client, payer, recent_blockhash) = program_test().start().await;
+    let StartOutputs {
+        mut banks_client,
+        payer,
+        recent_blockhash,
+        ..
+    } = program_test().start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[Instruction {
@@ -133,7 +140,12 @@ async fn test_create_with_a_lamport() {
     )
     .0;
 
-    let (mut banks_client, payer, recent_blockhash) = program_test().start().await;
+    let StartOutputs {
+        mut banks_client,
+        payer,
+        recent_blockhash,
+        ..
+    } = program_test().start().await;
 
     // Transfer 1 lamport into `assocated_account_address` before creating it
     let mut transaction = Transaction::new_with_payer(
@@ -199,7 +211,12 @@ async fn test_create_with_excess_lamports() {
     )
     .0;
 
-    let (mut banks_client, payer, recent_blockhash) = program_test().start().await;
+    let StartOutputs {
+        mut banks_client,
+        payer,
+        recent_blockhash,
+        ..
+    } = program_test().start().await;
 
     // Transfer 100 lamports into `assocated_account_address` before creating it
     let mut transaction = Transaction::new_with_payer(
@@ -265,7 +282,12 @@ async fn test_create_account_mismatch() {
     )
     .0;
 
-    let (mut banks_client, payer, recent_blockhash) = program_test().start().await;
+    let StartOutputs {
+        mut banks_client,
+        payer,
+        recent_blockhash,
+        ..
+    } = program_test().start().await;
 
     let mut transaction = Transaction::new_with_payer(
         &[Instruction {