Add program module for program id

Author: joncinque

associated-token-account/client/src/address.rs

@@ -45,7 +45,7 @@ pub fn get_associated_token_address_with_program_id(
     get_associated_token_address_and_bump_seed(
         wallet_address,
         token_mint_address,
-        &crate::id(),
+        &crate::program::id(),
         token_program_id,
     )
     .0

associated-token-account/client/src/instruction.rs

@@ -1,6 +1,6 @@
 //! Instruction creators for the program
 use {
-    crate::{address::get_associated_token_address_with_program_id, id},
+    crate::{address::get_associated_token_address_with_program_id, program::id},
     solana_program::{
         instruction::{AccountMeta, Instruction},
         pubkey::Pubkey,

associated-token-account/client/src/lib.rs

@@ -5,4 +5,7 @@
 pub mod address;
 pub mod instruction;
 
-solana_program::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+/// Module defining the program id
+pub mod program {
+    solana_program::declare_id!("ATokenGPvbdGVxr1b2hvZbsiqW5xWH25efTNsLJA8knL");
+}

associated-token-account/program/src/lib.rs

@@ -25,7 +25,7 @@ pub use spl_associated_token_account_client::address::{
 };
 // Export current SDK types for downstream users building with a different SDK
 // version
-pub use spl_associated_token_account_client::{check_id, id, ID};
+pub use spl_associated_token_account_client::program::{check_id, id, ID};
 
 /// Create an associated token account for the given wallet address and token
 /// mint

managed-token/program/src/accounts.rs

@@ -116,7 +116,7 @@ impl<'a, 'info> InitializeAccount<'a, 'info> {
             "Invalid key supplied for System Program",
         )?;
         assert_with_msg(
-            ctx.associated_token_program.key == &spl_associated_token_account_client::id(),
+            ctx.associated_token_program.key == &spl_associated_token_account_client::program::id(),
             ProgramError::InvalidInstructionData,
             "Invalid key supplied for Associataed Token Program",
         )?;

managed-token/program/src/instruction.rs

@@ -127,7 +127,7 @@ pub fn create_initialize_account_instruction(
             AccountMeta::new_readonly(freeze_authority, false),
             AccountMeta::new_readonly(*mint, false),
             AccountMeta::new_readonly(system_program::id(), false),
-            AccountMeta::new_readonly(spl_associated_token_account_client::id(), false),
+            AccountMeta::new_readonly(spl_associated_token_account_client::program::id(), false),
             AccountMeta::new_readonly(spl_token::id(), false),
         ],
         data: borsh::to_vec(&ManagedTokenInstruction::InitializeAccount)?,

token/cli/tests/command.rs

@@ -167,7 +167,7 @@ async fn new_validator_for_test() -> (TestValidator, Keypair) {
             upgrade_authority: Pubkey::new_unique(),
         },
         UpgradeableProgramInfo {
-            program_id: spl_associated_token_account_client::id(),
+            program_id: spl_associated_token_account_client::program::id(),
             loader: bpf_loader_upgradeable::id(),
             program_path: PathBuf::from("../../target/deploy/spl_associated_token_account.so"),
             upgrade_authority: Pubkey::new_unique(),