Skip to content

Commit b09cda4

Browse files
ananas-blockananas-block
authored
refactor: ctoken sdk dir structure (#2065)
* stash * refactor: compressed-token-sdk
1 parent 3274f97 commit b09cda4

120 files changed

Lines changed: 433 additions & 559 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎forester/src/compressible/compressor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ use std::{str::FromStr, sync::Arc};
33
use anchor_lang::{InstructionData, ToAccountMetas};
44
use forester_utils::rpc_pool::SolanaRpcPool;
55
use light_client::rpc::Rpc;
6-
use light_compressed_token_sdk::instructions::compress_and_close::CompressAndCloseAccounts as CTokenAccounts;
6+
use light_compressed_token_sdk::compressed_token::compress_and_close::CompressAndCloseAccounts as CTokenAccounts;
77
use light_compressible::config::CompressibleConfig;
88
use light_ctoken_types::COMPRESSED_TOKEN_PROGRAM_ID;
99
use light_registry::{

‎forester/tests/test_compressible_ctoken.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use light_client::{
99
local_test_validator::{spawn_validator, LightValidatorConfig},
1010
rpc::{LightClient, LightClientConfig, Rpc},
1111
};
12-
use light_compressed_token_sdk::instructions::create_compressed_mint;
12+
use light_compressed_token_sdk::compressed_token::create_compressed_mint;
1313
use light_ctoken_types::state::TokenDataVersion;
1414
use light_registry::{
1515
protocol_config::state::ProtocolConfigPda,

‎program-tests/compressed-token-test/tests/ctoken/compress_and_close.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ async fn test_compress_and_close_owner_scenarios() {
110110
.await;
111111

112112
// Set token balance on ATA
113-
use light_compressed_token_sdk::instructions::create_associated_token_account::derive_ctoken_ata;
113+
use light_compressed_token_sdk::ctoken::create_associated_token_account::derive_ctoken_ata;
114114
let (ata_pubkey, _bump) =
115115
derive_ctoken_ata(&context.owner_keypair.pubkey(), &context.mint_pubkey);
116116

@@ -440,8 +440,8 @@ async fn test_compressible_account_with_custom_rent_payer_close_with_compression
440440

441441
// Initialize compressible token account
442442
let create_token_account_ix =
443-
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
444-
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
443+
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
444+
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
445445
account_pubkey: token_account_pubkey,
446446
mint_pubkey: context.mint_pubkey,
447447
owner_pubkey: context.owner_keypair.pubkey(),

‎program-tests/compressed-token-test/tests/ctoken/create.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -227,8 +227,8 @@ async fn test_create_compressible_token_account_failing() {
227227
let token_account_pubkey = Keypair::new();
228228

229229
let create_token_account_ix =
230-
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
231-
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
230+
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
231+
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
232232
account_pubkey: token_account_pubkey.pubkey(),
233233
mint_pubkey: context.mint_pubkey,
234234
owner_pubkey: context.owner_keypair.pubkey(),
@@ -364,8 +364,8 @@ async fn test_create_compressible_token_account_failing() {
364364
};
365365

366366
let create_token_account_ix =
367-
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
368-
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
367+
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
368+
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
369369
account_pubkey: token_account_pubkey,
370370
mint_pubkey: context.mint_pubkey,
371371
owner_pubkey: context.owner_keypair.pubkey(),
@@ -412,8 +412,8 @@ async fn test_create_compressible_token_account_failing() {
412412
.unwrap();
413413

414414
let create_token_account_ix =
415-
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
416-
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
415+
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
416+
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
417417
account_pubkey: context.token_account_keypair.pubkey(),
418418
mint_pubkey: context.mint_pubkey,
419419
owner_pubkey: context.owner_keypair.pubkey(),
@@ -452,8 +452,8 @@ async fn test_create_compressible_token_account_failing() {
452452
let wrong_account_type = context.rpc.test_accounts.protocol.governance_authority_pda;
453453

454454
let create_token_account_ix =
455-
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
456-
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
455+
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
456+
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
457457
account_pubkey: context.token_account_keypair.pubkey(),
458458
mint_pubkey: context.mint_pubkey,
459459
owner_pubkey: context.owner_keypair.pubkey(),

‎program-tests/compressed-token-test/tests/ctoken/create_ata.rs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -275,8 +275,8 @@ async fn test_create_ata_failing() {
275275
context.mint_pubkey = solana_sdk::pubkey::Pubkey::new_unique();
276276
let new_owner = solana_sdk::signature::Keypair::new();
277277

278-
let create_ata_ix = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
279-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
278+
let create_ata_ix = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
279+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
280280
payer: poor_payer_pubkey,
281281
owner: new_owner.pubkey(),
282282
mint: context.mint_pubkey,
@@ -442,7 +442,7 @@ async fn test_create_ata_failing() {
442442
// Compressible config must be owned by the compressed-token program
443443
// Error: 14 (InvalidAccountOwner)
444444
{
445-
use light_compressed_token_sdk::instructions::create_compressible_associated_token_account;
445+
use light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account;
446446

447447
// Use different mint for this test
448448
context.mint_pubkey = solana_sdk::pubkey::Pubkey::new_unique();
@@ -451,7 +451,7 @@ async fn test_create_ata_failing() {
451451
let fake_config = solana_sdk::system_program::ID;
452452

453453
let create_ata_ix = create_compressible_associated_token_account(
454-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
454+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
455455
payer: payer_pubkey,
456456
owner: context.owner_keypair.pubkey(),
457457
mint: context.mint_pubkey,
@@ -478,7 +478,7 @@ async fn test_create_ata_failing() {
478478
// Using the protocol config account which has a different discriminator.
479479
// Error: 20000 (InvalidDiscriminator from account-checks)
480480
{
481-
use light_compressed_token_sdk::instructions::create_compressible_associated_token_account;
481+
use light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account;
482482

483483
// Use different mint for this test
484484
context.mint_pubkey = solana_sdk::pubkey::Pubkey::new_unique();
@@ -487,7 +487,7 @@ async fn test_create_ata_failing() {
487487
let wrong_account_type = context.rpc.test_accounts.protocol.governance_authority_pda;
488488

489489
let create_ata_ix = create_compressible_associated_token_account(
490-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
490+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
491491
payer: payer_pubkey,
492492
owner: context.owner_keypair.pubkey(),
493493
mint: context.mint_pubkey,
@@ -601,8 +601,8 @@ async fn test_ata_multiple_owners_same_mint() {
601601
};
602602

603603
// Create ATAs for each owner with the same mint
604-
let create_ata_ix1 = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
605-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
604+
let create_ata_ix1 = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
605+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
606606
payer: payer_pubkey,
607607
owner: owner1,
608608
mint,
@@ -632,8 +632,8 @@ async fn test_ata_multiple_owners_same_mint() {
632632
)
633633
.await;
634634

635-
let create_ata_ix2 = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
636-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
635+
let create_ata_ix2 = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
636+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
637637
payer: payer_pubkey,
638638
owner: owner2,
639639
mint,
@@ -663,8 +663,8 @@ async fn test_ata_multiple_owners_same_mint() {
663663
)
664664
.await;
665665

666-
let create_ata_ix3 = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
667-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
666+
let create_ata_ix3 = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
667+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
668668
payer: payer_pubkey,
669669
owner: owner3,
670670
mint,

‎program-tests/compressed-token-test/tests/ctoken/create_ata2.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,13 @@ async fn create_and_assert_ata2(
1515

1616
let create_ata_ix = if let Some(compressible) = compressible_data.as_ref() {
1717
let create_fn = if idempotent {
18-
light_compressed_token_sdk::instructions::create_compressible_associated_token_account2_idempotent
18+
light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account2_idempotent
1919
} else {
20-
light_compressed_token_sdk::instructions::create_compressible_associated_token_account2
20+
light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account2
2121
};
2222

2323
create_fn(
24-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
24+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
2525
payer: payer_pubkey,
2626
owner: owner_pubkey,
2727
mint: context.mint_pubkey,
@@ -35,9 +35,9 @@ async fn create_and_assert_ata2(
3535
.unwrap()
3636
} else {
3737
let create_fn = if idempotent {
38-
light_compressed_token_sdk::instructions::create_associated_token_account2_idempotent
38+
light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account2_idempotent
3939
} else {
40-
light_compressed_token_sdk::instructions::create_associated_token_account2
40+
light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account2
4141
};
4242

4343
create_fn(payer_pubkey, owner_pubkey, context.mint_pubkey).unwrap()

‎program-tests/compressed-token-test/tests/ctoken/functional.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,8 @@ async fn test_compressible_account_with_compression_authority_lifecycle() {
123123

124124
// Initialize compressible token account
125125
let create_token_account_ix =
126-
light_compressed_token_sdk::instructions::create_compressible_token_account_instruction(
127-
light_compressed_token_sdk::instructions::CreateCompressibleTokenAccount {
126+
light_compressed_token_sdk::ctoken::create_token_account::create_compressible_token_account_instruction(
127+
light_compressed_token_sdk::ctoken::create_token_account::CreateCompressibleTokenAccount {
128128
account_pubkey: token_account_pubkey,
129129
mint_pubkey: context.mint_pubkey,
130130
owner_pubkey: context.owner_keypair.pubkey(),

‎program-tests/compressed-token-test/tests/ctoken/functional_ata.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
use light_compressed_token_sdk::instructions::create_associated_token_account_idempotent;
1+
use light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account_idempotent;
22
use light_test_utils::assert_create_token_account::assert_create_associated_token_account;
33

44
use super::shared::*;
@@ -18,7 +18,7 @@ async fn test_associated_token_account_operations() {
1818
let owner_pubkey = context.owner_keypair.pubkey();
1919

2020
// Create basic ATA using SDK function
21-
let instruction = light_compressed_token_sdk::instructions::create_associated_token_account(
21+
let instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account(
2222
payer_pubkey,
2323
owner_pubkey,
2424
context.mint_pubkey,
@@ -47,8 +47,8 @@ async fn test_associated_token_account_operations() {
4747
let num_prepaid_epochs = 0;
4848
let lamports_per_write = Some(150);
4949
// Create compressible ATA
50-
let compressible_instruction = light_compressed_token_sdk::instructions::create_compressible_associated_token_account(
51-
light_compressed_token_sdk::instructions::CreateCompressibleAssociatedTokenAccountInputs {
50+
let compressible_instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_compressible_associated_token_account(
51+
light_compressed_token_sdk::ctoken::create_associated_token_account::CreateCompressibleAssociatedTokenAccountInputs {
5252
payer: payer_pubkey,
5353
owner: compressible_owner_pubkey,
5454
mint: context.mint_pubkey,
@@ -139,7 +139,7 @@ async fn test_create_ata_idempotent() {
139139
let payer_pubkey = context.payer.pubkey();
140140
let owner_pubkey = context.owner_keypair.pubkey();
141141
// Create ATA using non-idempotent instruction (first creation)
142-
let instruction = light_compressed_token_sdk::instructions::create_associated_token_account::create_associated_token_account(
142+
let instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account(
143143
payer_pubkey,
144144
owner_pubkey,
145145
context.mint_pubkey,
@@ -162,7 +162,7 @@ async fn test_create_ata_idempotent() {
162162
.await;
163163

164164
// Attempt to create the same ATA again using non-idempotent instruction (should fail)
165-
let instruction = light_compressed_token_sdk::instructions::create_associated_token_account::create_associated_token_account(
165+
let instruction = light_compressed_token_sdk::ctoken::create_associated_token_account::create_associated_token_account(
166166
payer_pubkey,
167167
owner_pubkey,
168168
context.mint_pubkey,

0 commit comments

Comments
 (0)