Refactor tests to use to_account_metas, remove unused dependency

- Replace manual AccountMeta vectors with to_account_metas(Some(true))
- Fix create-token-account: change account field to Signer for CPI
- Remove unused light-token-interface dependency from all Cargo.toml

Author: tilo-14

program-examples/anchor/programs-sdk/Cargo.lock

@@ -38,6 +38,5 @@ solana-program = "2.2"
 light-sdk = { version = "0.19.0", features = ["anchor", "idl-build", "v2", "anchor-discriminator", "cpi-context"] }
 light-token = { version = "0.4.0", features = ["anchor"] }
 light-token-types = { version = "0.4.0", features = ["anchor"] }
-light-token-interface = "0.3.0"
 light-program-test = "0.19.0"
 light-client = { version = "0.19.0", features = ["v2", "anchor"] }

program-examples/anchor/programs-sdk/Cargo.toml

@@ -21,7 +21,6 @@ light-token = { workspace = true }
 [dev-dependencies]
 light-program-test = { workspace = true }
 light-client = { workspace = true }
-light-token-interface = { workspace = true }
 borsh = { workspace = true }
 tokio = { workspace = true }
 solana-sdk = { workspace = true }

program-examples/anchor/programs-sdk/approve/Cargo.toml

@@ -1,13 +1,8 @@
-use anchor_lang::InstructionData;
+use anchor_lang::{InstructionData, ToAccountMetas};
 use light_program_test::Rpc;
 use light_token::instruction::LIGHT_TOKEN_PROGRAM_ID;
-use light_token_anchor_approve::{instruction::Approve, ID};
-use solana_sdk::{
-    instruction::{AccountMeta, Instruction},
-    signature::Keypair,
-    signer::Signer,
-    system_program,
-};
+use light_token_anchor_approve::{accounts, instruction::Approve, ID};
+use solana_sdk::{instruction::Instruction, signature::Keypair, signer::Signer, system_program};
 use test_utils::{mint_tokens, setup_test_env};
 
 #[tokio::test]
@@ -24,13 +19,14 @@ async fn test_approve() {
 
     let ix = Instruction {
         program_id: ID,
-        accounts: vec![
-            AccountMeta::new_readonly(LIGHT_TOKEN_PROGRAM_ID, false),
-            AccountMeta::new(env.ata, false),
-            AccountMeta::new_readonly(delegate.pubkey(), false),
-            AccountMeta::new_readonly(env.payer.pubkey(), true),
-            AccountMeta::new_readonly(system_program::ID, false),
-        ],
+        accounts: accounts::ApproveAccounts {
+            light_token_program: LIGHT_TOKEN_PROGRAM_ID,
+            token_account: env.ata,
+            delegate: delegate.pubkey(),
+            owner: env.payer.pubkey(),
+            system_program: system_program::ID,
+        }
+        .to_account_metas(Some(true)),
         data: Approve { amount: approve_amount }.data(),
     };
 

program-examples/anchor/programs-sdk/approve/tests/test.rs

@@ -22,7 +22,6 @@ light-token = { workspace = true }
 light-program-test = { workspace = true }
 light-client = { workspace = true }
 light-token = { workspace = true }
-light-token-interface = { workspace = true }
 borsh = { workspace = true }
 tokio = { workspace = true }
 solana-sdk = { workspace = true }

program-examples/anchor/programs-sdk/burn/Cargo.toml

@@ -1,12 +1,8 @@
-use anchor_lang::InstructionData;
+use anchor_lang::{InstructionData, ToAccountMetas};
 use light_program_test::Rpc;
 use light_token::instruction::LIGHT_TOKEN_PROGRAM_ID;
-use light_token_anchor_burn::{instruction::Burn, ID};
-use solana_sdk::{
-    instruction::{AccountMeta, Instruction},
-    signer::Signer,
-    system_program,
-};
+use light_token_anchor_burn::{accounts, instruction::Burn, ID};
+use solana_sdk::{instruction::Instruction, signer::Signer, system_program};
 use test_utils::{mint_tokens, setup_test_env};
 
 #[tokio::test]
@@ -21,13 +17,14 @@ async fn test_burn() {
     let burn_amount = 250_000u64;
     let ix = Instruction {
         program_id: ID,
-        accounts: vec![
-            AccountMeta::new_readonly(LIGHT_TOKEN_PROGRAM_ID, false),
-            AccountMeta::new(env.ata, false),
-            AccountMeta::new(env.mint_pda, false),
-            AccountMeta::new_readonly(env.payer.pubkey(), true),
-            AccountMeta::new_readonly(system_program::ID, false),
-        ],
+        accounts: accounts::BurnAccounts {
+            light_token_program: LIGHT_TOKEN_PROGRAM_ID,
+            source: env.ata,
+            mint: env.mint_pda,
+            authority: env.payer.pubkey(),
+            system_program: system_program::ID,
+        }
+        .to_account_metas(Some(true)),
         data: Burn { amount: burn_amount }.data(),
     };
 

program-examples/anchor/programs-sdk/burn/tests/test.rs

@@ -21,7 +21,6 @@ light-token = { workspace = true }
 [dev-dependencies]
 light-program-test = { workspace = true }
 light-client = { workspace = true }
-light-token-interface = { workspace = true }
 borsh = { workspace = true }
 tokio = { workspace = true }
 solana-sdk = { workspace = true }

program-examples/anchor/programs-sdk/close/Cargo.toml

@@ -1,11 +1,8 @@
-use anchor_lang::InstructionData;
+use anchor_lang::{InstructionData, ToAccountMetas};
 use light_program_test::Rpc;
 use light_token::instruction::{rent_sponsor_pda, LIGHT_TOKEN_PROGRAM_ID};
-use light_token_anchor_close::{instruction::CloseAccount, ID};
-use solana_sdk::{
-    instruction::{AccountMeta, Instruction},
-    signer::Signer,
-};
+use light_token_anchor_close::{accounts, instruction::CloseAccount, ID};
+use solana_sdk::{instruction::Instruction, signer::Signer};
 use test_utils::setup_test_env;
 
 #[tokio::test]
@@ -19,13 +16,14 @@ async fn test_close() {
 
     let ix = Instruction {
         program_id: ID,
-        accounts: vec![
-            AccountMeta::new_readonly(LIGHT_TOKEN_PROGRAM_ID, false),
-            AccountMeta::new(env.ata, false),
-            AccountMeta::new(env.payer.pubkey(), false),
-            AccountMeta::new_readonly(env.payer.pubkey(), true),
-            AccountMeta::new(rent_sponsor, false),
-        ],
+        accounts: accounts::CloseAccountAccounts {
+            light_token_program: LIGHT_TOKEN_PROGRAM_ID,
+            account: env.ata,
+            destination: env.payer.pubkey(),
+            owner: env.payer.pubkey(),
+            rent_sponsor,
+        }
+        .to_account_metas(Some(true)),
         data: CloseAccount {}.data(),
     };
 

program-examples/anchor/programs-sdk/close/tests/test.rs

@@ -21,7 +21,6 @@ light-token = { workspace = true }
 [dev-dependencies]
 light-program-test = { workspace = true }
 light-client = { workspace = true }
-light-token-interface = { workspace = true }
 borsh = { workspace = true }
 tokio = { workspace = true }
 solana-sdk = { workspace = true }

program-examples/anchor/programs-sdk/create-ata/Cargo.toml

@@ -1,14 +1,14 @@
-use anchor_lang::InstructionData;
+use anchor_lang::{InstructionData, ToAccountMetas};
 use light_client::indexer::AddressWithTree;
 use light_program_test::{Indexer, LightProgramTest, ProgramTestConfig, Rpc};
-use light_token_anchor_create_ata::{instruction::CreateAta, ID};
+use light_token_anchor_create_ata::{accounts, instruction::CreateAta, ID};
 use light_token::instruction::{
     CreateMint, CreateMintParams, config_pda, derive_mint_compressed_address, derive_token_ata,
     find_mint_address, rent_sponsor_pda, LIGHT_TOKEN_PROGRAM_ID,
 };
 use anchor_lang::system_program;
 use solana_sdk::{
-    instruction::{AccountMeta, Instruction},
+    instruction::Instruction,
     signature::Keypair,
     signer::Signer,
 };
@@ -82,16 +82,17 @@ async fn test_create_ata() {
 
     let ix = Instruction {
         program_id: ID,
-        accounts: vec![
-            AccountMeta::new_readonly(LIGHT_TOKEN_PROGRAM_ID, false),
-            AccountMeta::new_readonly(payer.pubkey(), false),
-            AccountMeta::new_readonly(mint_pda, false),
-            AccountMeta::new(payer.pubkey(), true),
-            AccountMeta::new(ata, false),
-            AccountMeta::new_readonly(system_program::ID, false),
-            AccountMeta::new_readonly(compressible_config, false),
-            AccountMeta::new(rent_sponsor, false),
-        ],
+        accounts: accounts::CreateAtaAccounts {
+            light_token_program: LIGHT_TOKEN_PROGRAM_ID,
+            owner: payer.pubkey(),
+            mint: mint_pda,
+            payer: payer.pubkey(),
+            associated_token_account: ata,
+            system_program: system_program::ID,
+            compressible_config,
+            rent_sponsor,
+        }
+        .to_account_metas(Some(true)),
         data: CreateAta {
             bump: ata_bump,
             idempotent: false,