From 20551f9fbc8ccbfd786403e067280147f7eb0a35 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Mon, 2 Nov 2020 18:10:19 -0800
Subject: [PATCH] Adapt to https://github.com/solana-labs/solana/pull/13355

---
 .../program/tests/functional.rs               | 43 +++++++++++++------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/associated-token-account/program/tests/functional.rs b/associated-token-account/program/tests/functional.rs
index 15a37c0c..999d303e 100644
--- a/associated-token-account/program/tests/functional.rs
+++ b/associated-token-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,
@@ -49,9 +47,13 @@ async fn test_associated_token_address() {
     let associated_token_address =
         get_associated_token_address(&wallet_address, &token_mint_address);
 
-    let (mut banks_client, payer, recent_blockhash) =
-        program_test(token_mint_address).start().await;
-    let rent = Rent::default(); // <-- TODO: get Rent from `ProgramTest`
+    let StartOutputs {
+        mut banks_client,
+        payer,
+        recent_blockhash,
+        rent,
+        ..
+    } = program_test().start().await;
     let expected_token_account_balance = rent.minimum_balance(spl_token::state::Account::LEN);
 
     // Associated account does not exist
@@ -95,9 +97,13 @@ async fn test_create_with_a_lamport() {
     let associated_token_address =
         get_associated_token_address(&wallet_address, &token_mint_address);
 
-    let (mut banks_client, payer, recent_blockhash) =
-        program_test(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().start().await;
     let expected_token_account_balance = rent.minimum_balance(spl_token::state::Account::LEN);
 
     // Transfer 1 lamport into `associated_token_address` before creating it
@@ -148,9 +154,13 @@ async fn test_create_with_excess_lamports() {
     let associated_token_address =
         get_associated_token_address(&wallet_address, &token_mint_address);
 
-    let (mut banks_client, payer, recent_blockhash) =
-        program_test(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().start().await;
     let expected_token_account_balance = rent.minimum_balance(spl_token::state::Account::LEN);
 
     // Transfer 1 lamport into `associated_token_address` before creating it
@@ -201,8 +211,13 @@ async fn test_create_account_mismatch() {
     let _associated_token_address =
         get_associated_token_address(&wallet_address, &token_mint_address);
 
-    let (mut banks_client, payer, recent_blockhash) =
-        program_test(token_mint_address).start().await;
+    let StartOutputs {
+        mut banks_client,
+        payer,
+        recent_blockhash,
+        ..
+    } = program_test().start().await;
+    let expected_token_account_balance = rent.minimum_balance(spl_token::state::Account::LEN);
 
     let mut instruction =
         create_associated_token_account(&payer.pubkey(), &wallet_address, &token_mint_address);