From a477895f0247e4ab2437cc7079ddedce9fb02596 Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 25 Nov 2020 11:26:08 -0800
Subject: [PATCH] program-test now adds SPL Token automatically

---
 .../program/tests/functional.rs                     |  7 -------
 feature-proposal/program/tests/functional.rs        | 13 ++-----------
 stake-pool/program/tests/functional.rs              | 13 ++-----------
 3 files changed, 4 insertions(+), 29 deletions(-)

diff --git a/associated-token-account/program/tests/functional.rs b/associated-token-account/program/tests/functional.rs
index 09a9f946..af20aa4c 100644
--- a/associated-token-account/program/tests/functional.rs
+++ b/associated-token-account/program/tests/functional.rs
@@ -16,13 +16,6 @@ fn program_test(token_mint_address: Pubkey) -> ProgramTest {
         processor!(processor::process_instruction),
     );
 
-    // Add SPL Token program
-    pc.add_program(
-        "spl_token",
-        spl_token::id(),
-        processor!(spl_token::processor::Processor::process),
-    );
-
     // Add a token mint account
     //
     // The account data was generated by running:
diff --git a/feature-proposal/program/tests/functional.rs b/feature-proposal/program/tests/functional.rs
index 9dce51ec..451e6c90 100644
--- a/feature-proposal/program/tests/functional.rs
+++ b/feature-proposal/program/tests/functional.rs
@@ -18,20 +18,11 @@ use spl_feature_proposal::{instruction::*, state::*, *};
 use std::io;
 
 fn program_test() -> ProgramTest {
-    let mut pc = ProgramTest::new(
+    ProgramTest::new(
         "spl_feature_proposal",
         id(),
         processor!(processor::process_instruction),
-    );
-
-    // Add SPL Token program
-    pc.add_program(
-        "spl_token",
-        spl_token::id(),
-        processor!(spl_token::processor::Processor::process),
-    );
-
-    pc
+    )
 }
 
 /// Fetch and unpack account data
diff --git a/stake-pool/program/tests/functional.rs b/stake-pool/program/tests/functional.rs
index 3e5d2286..5833dfac 100644
--- a/stake-pool/program/tests/functional.rs
+++ b/stake-pool/program/tests/functional.rs
@@ -13,20 +13,11 @@ use bincode::deserialize;
 const TEST_STAKE_AMOUNT: u64 = 100;
 
 fn program_test() -> ProgramTest {
-    let mut pc = ProgramTest::new(
+    ProgramTest::new(
         "spl_stake_pool",
         id(),
         processor!(processor::Processor::process),
-    );
-
-    // Add SPL Token program
-    pc.add_program(
-        "spl_token",
-        spl_token::id(),
-        processor!(spl_token::processor::Processor::process),
-    );
-
-    pc
+    )
 }
 
 async fn create_mint(