update imports in repo

kevinheavey · kevinheavey · commit b057f1a2f129 · 2024-07-10T22:08:18.000+04:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/associated-token-account/program/src/instruction.rs b/associated-token-account/program/src/instruction.rs
@@ -1,13 +1,14 @@
 //! Program instructions
 
 use {
-    crate::{get_associated_token_address_with_program_id, id},
+    crate::id,
     assert_matches::assert_matches,
     borsh::{BorshDeserialize, BorshSchema, BorshSerialize},
     solana_program::{
         instruction::{AccountMeta, Instruction},
         pubkey::Pubkey,
     },
+    spl_associated_token_address::get_associated_token_address_with_program_id,
 };
 
 /// Instructions supported by the AssociatedTokenAccount program
diff --git a/managed-token/program/tests/test.rs b/managed-token/program/tests/test.rs
@@ -10,9 +10,8 @@ use {
         system_instruction,
         transaction::Transaction,
     },
-    spl_associated_token_account::{
-        get_associated_token_address, instruction::create_associated_token_account,
-    },
+    spl_associated_token_account::instruction::create_associated_token_account,
+    spl_associated_token_address::get_associated_token_address,
     spl_managed_token::instruction::*,
     spl_token::state::Account as TokenAccount,
 };
diff --git a/single-pool/cli/Cargo.toml b/single-pool/cli/Cargo.toml
@@ -31,9 +31,6 @@ spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
 spl-token-client = { version = "0.11.0", path = "../../token/client" }
-spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [
-  "no-entrypoint",
-] }
 spl-single-pool = { version = "1.0.0", path = "../program", features = [
   "no-entrypoint",
 ] }
diff --git a/single-pool/program/Cargo.toml b/single-pool/program/Cargo.toml
@@ -23,15 +23,16 @@ spl-program-ids = { version = "1.0.0", path = "../../program-ids" }
 spl-token = { version = "6.0", path = "../../token/program", features = [
   "no-entrypoint",
 ] }
-spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [
-  "no-entrypoint",
-] }
 thiserror = "1.0"
 
 [dev-dependencies]
 solana-program-test = "2.0.0"
 solana-sdk = "2.0.0"
 solana-vote-program = "2.0.0"
+spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [
+  "no-entrypoint",
+] }
+spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
 test-case = "3.3"
 bincode = "1.3.1"
 rand = "0.8.5"
diff --git a/single-pool/program/tests/deposit.rs b/single-pool/program/tests/deposit.rs
@@ -12,7 +12,7 @@ use {
         stake::state::{Authorized, Lockup},
         transaction::Transaction,
     },
-    spl_associated_token_account as atoken,
+    spl_associated_token_address as atoken,
     spl_single_pool::{
         error::SinglePoolError, find_default_deposit_account_address, id, instruction,
     },
diff --git a/single-pool/program/tests/helpers/mod.rs b/single-pool/program/tests/helpers/mod.rs
@@ -17,7 +17,7 @@ use {
         self, vote_instruction,
         vote_state::{VoteInit, VoteState},
     },
-    spl_associated_token_account as atoken,
+    spl_associated_token_address as atoken,
     spl_single_pool::{
         find_pool_address, find_pool_mint_address, find_pool_mint_authority_address,
         find_pool_mpl_authority_address, find_pool_stake_address,
diff --git a/token-wrap/program/Cargo.toml b/token-wrap/program/Cargo.toml
@@ -15,7 +15,6 @@ test-sbf = []
 bytemuck = { version = "1.16.1", features = ["derive"] }
 num_enum = "0.7"
 solana-program = "2.0.0"
-spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = ["no-entrypoint"] }
 spl-program-ids = { version = "1.0.0", path = "../../program-ids" }
 spl-token = { version = "6.0", path = "../../token/program", features = ["no-entrypoint"] }
 spl-token-2022 = { version = "4.0.0", path = "../../token/program-2022", features = ["no-entrypoint"] }
diff --git a/token/cli/Cargo.toml b/token/cli/Cargo.toml
@@ -37,9 +37,7 @@ spl-token-2022 = { version = "4.0.0", path = "../program-2022", features = [
 spl-token-client = { version = "0.11.0", path = "../client" }
 spl-token-metadata-interface = { version = "0.4.0", path = "../../token-metadata/interface" }
 spl-token-group-interface = { version = "0.3.0", path = "../../token-group/interface" }
-spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [
-  "no-entrypoint",
-] }
+spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
 spl-memo = { version = "5.0", path = "../../memo/program", features = [
   "no-entrypoint",
 ] }
@@ -49,6 +47,7 @@ tokio = "1.38"
 
 [dev-dependencies]
 solana-test-validator = "2.0.0"
+spl-program-ids = { path = "../../program-ids", version = "1.0.0" }
 assert_cmd = "2.0.14"
 libtest-mimic = "0.7"
 serial_test = "3.1.1"
diff --git a/token/cli/src/bench.rs b/token/cli/src/bench.rs
@@ -12,7 +12,7 @@ use {
         message::Message, native_token::lamports_to_sol, native_token::Sol, program_pack::Pack,
         pubkey::Pubkey, signature::Signer, system_instruction,
     },
-    spl_associated_token_account::*,
+    spl_associated_token_address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::StateWithExtensions,
         instruction,
diff --git a/token/cli/src/command.rs b/token/cli/src/command.rs
@@ -34,7 +34,7 @@ use {
         signature::{Keypair, Signer},
         system_program,
     },
-    spl_associated_token_account::get_associated_token_address_with_program_id,
+    spl_associated_token_address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::{
             confidential_transfer::{
diff --git a/token/cli/src/config.rs b/token/cli/src/config.rs
@@ -15,7 +15,7 @@ use {
         account::Account as RawAccount, commitment_config::CommitmentConfig, hash::Hash,
         pubkey::Pubkey, signature::Signer,
     },
-    spl_associated_token_account::*,
+    spl_associated_token_address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::StateWithExtensionsOwned,
         state::{Account, Mint},
diff --git a/token/cli/src/sort.rs b/token/cli/src/sort.rs
@@ -8,7 +8,7 @@ use {
     solana_account_decoder::{parse_token::TokenAccountType, UiAccountData},
     solana_client::rpc_response::RpcKeyedAccount,
     solana_sdk::pubkey::Pubkey,
-    spl_associated_token_account::get_associated_token_address_with_program_id,
+    spl_associated_token_address::get_associated_token_address_with_program_id,
     std::{
         collections::{btree_map::Entry, BTreeMap},
         str::FromStr,
diff --git a/token/cli/tests/command.rs b/token/cli/tests/command.rs
@@ -14,7 +14,7 @@ use {
         transaction::Transaction,
     },
     solana_test_validator::{TestValidator, TestValidatorGenesis, UpgradeableProgramInfo},
-    spl_associated_token_account::get_associated_token_address_with_program_id,
+    spl_associated_token_address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::{
             confidential_transfer::{ConfidentialTransferAccount, ConfidentialTransferMint},
@@ -165,7 +165,7 @@ async fn new_validator_for_test() -> (TestValidator, Keypair) {
             upgrade_authority: Pubkey::new_unique(),
         },
         UpgradeableProgramInfo {
-            program_id: spl_associated_token_account::id(),
+            program_id: spl_program_ids::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(),
diff --git a/token/client/Cargo.toml b/token/client/Cargo.toml
@@ -23,6 +23,7 @@ solana-sdk = "2.0.0"
 spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program", features = [
   "no-entrypoint",
 ] }
+spl-associated-token-address = { version = "1.0.0", path = "../../associated-token-address" }
 spl-memo = { version = "5.0", path = "../../memo/program", features = [
   "no-entrypoint",
 ] }
diff --git a/token/client/src/token.rs b/token/client/src/token.rs
@@ -22,12 +22,8 @@ use {
         system_instruction,
         transaction::Transaction,
     },
-    spl_associated_token_account::{
-        get_associated_token_address_with_program_id,
-        instruction::{
-            create_associated_token_account, create_associated_token_account_idempotent,
-        },
-    },
+    spl_associated_token_account::instruction::{create_associated_token_account, create_associated_token_account_idempotent},
+    spl_associated_token_address::get_associated_token_address_with_program_id,
     spl_token_2022::{
         extension::{
             confidential_transfer::{
diff --git a/token/program-2022-test/Cargo.toml b/token/program-2022-test/Cargo.toml
@@ -22,7 +22,6 @@ futures-util = "0.3"
 solana-program = "2.0.0"
 solana-program-test = "2.0.0"
 solana-sdk = "2.0.0"
-spl-associated-token-account = { version = "4.0.0", path = "../../associated-token-account/program" }
 spl-memo = { version = "5.0.0", path = "../../memo/program", features = [
   "no-entrypoint",
 ] }
