Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions clients/cli/src/create_mint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ pub struct CreateMintArgs {
#[clap(value_parser = parse_pubkey)]
pub unwrapped_mint: Pubkey,

/// The address of the token program that the unwrapped mint belongs to
#[clap(value_parser = parse_token_program)]
pub unwrapped_token_program: Pubkey,

/// The address of the token program that the wrapped mint should belong to
#[clap(value_parser = parse_token_program)]
pub wrapped_token_program: Pubkey,
Expand Down
2 changes: 0 additions & 2 deletions clients/cli/tests/helpers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ pub async fn create_unwrapped_mint(env: &TestEnv, token_program_addr: &Pubkey) -
pub async fn execute_create_mint(
env: &TestEnv,
unwrapped_mint: &Pubkey,
unwrapped_token_program: &Pubkey,
wrapped_token_program: &Pubkey,
) {
let status = Command::new(TOKEN_WRAP_CLI_BIN)
Expand All @@ -127,7 +126,6 @@ pub async fn execute_create_mint(
"-C",
&env.config_file_path,
&unwrapped_mint.to_string(),
&unwrapped_token_program.to_string(),
&wrapped_token_program.to_string(),
"--idempotent",
])
Expand Down
8 changes: 1 addition & 7 deletions clients/cli/tests/test_create_mint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,7 @@ async fn test_create_mint() {
let unwrapped_token_program = spl_token::id();
let wrapped_token_program = spl_token_2022::id();
let unwrapped_mint = create_unwrapped_mint(&env, &unwrapped_token_program).await;
execute_create_mint(
&env,
&unwrapped_mint,
&unwrapped_token_program,
&wrapped_token_program,
)
.await;
execute_create_mint(&env, &unwrapped_mint, &wrapped_token_program).await;

// Derive expected account addresses
let wrapped_mint_address = get_wrapped_mint_address(&unwrapped_mint, &wrapped_token_program);
Expand Down
8 changes: 1 addition & 7 deletions clients/cli/tests/test_unwrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,7 @@ async fn setup_for_unwrap(
let unwrapped_token_program = spl_token::id();
let wrapped_token_program = spl_token_2022::id();
let unwrapped_mint = create_unwrapped_mint(env, &unwrapped_token_program).await;
execute_create_mint(
env,
&unwrapped_mint,
&unwrapped_token_program,
&wrapped_token_program,
)
.await;
execute_create_mint(env, &unwrapped_mint, &wrapped_token_program).await;

// --- Setup Accounts for Initial Wrap ---
// 1) Source account for unwrapped tokens (owned by payer)
Expand Down
24 changes: 3 additions & 21 deletions clients/cli/tests/test_wrap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,7 @@ async fn test_wrap_single_signer_with_defaults() {
let unwrapped_token_program = spl_token::id();
let wrapped_token_program = spl_token_2022::id();
let unwrapped_mint = create_unwrapped_mint(&env, &unwrapped_token_program).await;
execute_create_mint(
&env,
&unwrapped_mint,
&unwrapped_token_program,
&wrapped_token_program,
)
.await;
execute_create_mint(&env, &unwrapped_mint, &wrapped_token_program).await;

// Fund initial unwrapped token account
let unwrapped_token_account = create_token_account(
Expand Down Expand Up @@ -109,13 +103,7 @@ async fn test_wrap_single_signer_with_optional_flags() {
let unwrapped_token_program = spl_token::id();
let wrapped_token_program = spl_token_2022::id();
let unwrapped_mint = create_unwrapped_mint(&env, &unwrapped_token_program).await;
execute_create_mint(
&env,
&unwrapped_mint,
&unwrapped_token_program,
&wrapped_token_program,
)
.await;
execute_create_mint(&env, &unwrapped_mint, &wrapped_token_program).await;

let transfer_authority = Keypair::new();
let authority_keypair_file = NamedTempFile::new().unwrap();
Expand Down Expand Up @@ -250,13 +238,7 @@ async fn test_wrap_with_multisig() {

let unwrapped_mint = create_unwrapped_mint(&env, &unwrapped_token_program).await;

execute_create_mint(
&env,
&unwrapped_mint,
&unwrapped_token_program,
&wrapped_token_program,
)
.await;
execute_create_mint(&env, &unwrapped_mint, &wrapped_token_program).await;

let unwrapped_token_account = create_token_account(
&env,
Expand Down