From cd2c406c7b43aaf9709ab3030a2411cb2732b361 Mon Sep 17 00:00:00 2001
From: Jon Cinque <me@jonc.dev>
Date: Tue, 15 Aug 2023 18:04:42 +0200
Subject: [PATCH] cli: Remove dependencies on built programs in tests (#5027)

* token-upgrade-cli: Remove token, token-2022, and ata from test

* single-pool-cli: Remove token and ATA from test

* Also remove the program builds from CI
---
 .../workflows/pull-request-single-pool.yml    |  2 --
 .../workflows/pull-request-token-upgrade.yml  |  3 --
 single-pool/cli/tests/test.rs                 | 12 -------
 token-upgrade/cli/src/main.rs                 | 32 ++++---------------
 4 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/.github/workflows/pull-request-single-pool.yml b/.github/workflows/pull-request-single-pool.yml
index 5360c618395..da122273275 100644
--- a/.github/workflows/pull-request-single-pool.yml
+++ b/.github/workflows/pull-request-single-pool.yml
@@ -108,8 +108,6 @@ jobs:
 
       - name: Build dependent programs
         run: |
-          cargo build-sbf --manifest-path=token/program/Cargo.toml
-          cargo build-sbf --manifest-path=associated-token-account/program/Cargo.toml
           cargo build-sbf --manifest-path=single-pool/program/Cargo.toml
 
       - name: Build and test
diff --git a/.github/workflows/pull-request-token-upgrade.yml b/.github/workflows/pull-request-token-upgrade.yml
index 2795c2e88b9..f1b321a4d17 100644
--- a/.github/workflows/pull-request-token-upgrade.yml
+++ b/.github/workflows/pull-request-token-upgrade.yml
@@ -99,9 +99,6 @@ jobs:
 
       - name: Build dependent programs
         run: |
-          cargo build-sbf --manifest-path ./token/program/Cargo.toml
-          cargo build-sbf --manifest-path ./token/program-2022/Cargo.toml
-          cargo build-sbf --manifest-path ./associated-token-account/program/Cargo.toml
           cargo build-sbf --manifest-path ./token-upgrade/program/Cargo.toml
 
       - name: Run CLI tests
diff --git a/single-pool/cli/tests/test.rs b/single-pool/cli/tests/test.rs
index 5d13b065df3..6976a33c832 100644
--- a/single-pool/cli/tests/test.rs
+++ b/single-pool/cli/tests/test.rs
@@ -112,18 +112,6 @@ async fn start_validator() -> (TestValidator, Keypair) {
     ));
 
     test_validator_genesis.add_upgradeable_programs_with_path(&[
-        UpgradeableProgramInfo {
-            program_id: spl_token::id(),
-            loader: bpf_loader_upgradeable::id(),
-            program_path: PathBuf::from("../../target/deploy/spl_token.so"),
-            upgrade_authority: Pubkey::default(),
-        },
-        UpgradeableProgramInfo {
-            program_id: spl_associated_token_account::id(),
-            loader: bpf_loader_upgradeable::id(),
-            program_path: PathBuf::from("../../target/deploy/spl_associated_token_account.so"),
-            upgrade_authority: Pubkey::default(),
-        },
         UpgradeableProgramInfo {
             program_id: Pubkey::from_str("metaqbxxUerdq28cj1RbAWkYQm3ybzjb6a8bt518x1s").unwrap(),
             loader: bpf_loader_upgradeable::id(),
diff --git a/token-upgrade/cli/src/main.rs b/token-upgrade/cli/src/main.rs
index 01eaa4ce97c..6d52ec714b8 100644
--- a/token-upgrade/cli/src/main.rs
+++ b/token-upgrade/cli/src/main.rs
@@ -504,32 +504,12 @@ mod test {
     async fn new_validator_for_test() -> (TestValidator, Keypair) {
         solana_logger::setup();
         let mut test_validator_genesis = TestValidatorGenesis::default();
-        test_validator_genesis.add_upgradeable_programs_with_path(&[
-            UpgradeableProgramInfo {
-                program_id: spl_token::id(),
-                loader: bpf_loader_upgradeable::id(),
-                program_path: PathBuf::from("../../target/deploy/spl_token.so"),
-                upgrade_authority: Pubkey::new_unique(),
-            },
-            UpgradeableProgramInfo {
-                program_id: spl_associated_token_account::id(),
-                loader: bpf_loader_upgradeable::id(),
-                program_path: PathBuf::from("../../target/deploy/spl_associated_token_account.so"),
-                upgrade_authority: Pubkey::new_unique(),
-            },
-            UpgradeableProgramInfo {
-                program_id: spl_token_2022::id(),
-                loader: bpf_loader_upgradeable::id(),
-                program_path: PathBuf::from("../../target/deploy/spl_token_2022.so"),
-                upgrade_authority: Pubkey::new_unique(),
-            },
-            UpgradeableProgramInfo {
-                program_id: spl_token_upgrade::id(),
-                loader: bpf_loader_upgradeable::id(),
-                program_path: PathBuf::from("../../target/deploy/spl_token_upgrade.so"),
-                upgrade_authority: Pubkey::new_unique(),
-            },
-        ]);
+        test_validator_genesis.add_upgradeable_programs_with_path(&[UpgradeableProgramInfo {
+            program_id: spl_token_upgrade::id(),
+            loader: bpf_loader_upgradeable::id(),
+            program_path: PathBuf::from("../../target/deploy/spl_token_upgrade.so"),
+            upgrade_authority: Pubkey::new_unique(),
+        }]);
         test_validator_genesis.start_async().await
     }