From 3d53fa259c0dc70d28e70c6bc60ee22db46d6380 Mon Sep 17 00:00:00 2001 From: Tyera Eulberg Date: Wed, 3 Aug 2022 23:24:37 -0700 Subject: [PATCH] Move ATA tests to separate crate (#3429) --- Cargo.lock | 14 +++++++++++-- Cargo.toml | 1 + .../program-test/Cargo.toml | 19 ++++++++++++++++++ .../tests/create_idempotent.rs | 0 .../tests/extended_mint.rs | 0 .../tests/fixtures/token-mint-data.bin | Bin ...process_create_associated_token_account.rs | 0 .../tests/program_test.rs | 0 .../tests/recover_nested.rs | 0 .../tests/spl_token_create.rs | 0 associated-token-account/program/Cargo.toml | 4 ---- 11 files changed, 32 insertions(+), 6 deletions(-) create mode 100644 associated-token-account/program-test/Cargo.toml rename associated-token-account/{program => program-test}/tests/create_idempotent.rs (100%) rename associated-token-account/{program => program-test}/tests/extended_mint.rs (100%) rename associated-token-account/{program => program-test}/tests/fixtures/token-mint-data.bin (100%) rename associated-token-account/{program => program-test}/tests/process_create_associated_token_account.rs (100%) rename associated-token-account/{program => program-test}/tests/program_test.rs (100%) rename associated-token-account/{program => program-test}/tests/recover_nested.rs (100%) rename associated-token-account/{program => program-test}/tests/spl_token_create.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index be954f98..a21362c3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -5839,13 +5839,23 @@ dependencies = [ "num-derive", "num-traits", "solana-program", - "solana-program-test", - "solana-sdk", "spl-token 3.4.0", "spl-token-2022 0.4.2", "thiserror", ] +[[package]] +name = "spl-associated-token-account-test" +version = "0.0.1" +dependencies = [ + "solana-program", + "solana-program-test", + "solana-sdk", + "spl-associated-token-account 1.1.0", + "spl-token 3.4.0", + "spl-token-2022 0.4.2", +] + [[package]] name = "spl-binary-oracle-pair" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 8317eac3..e6bacfa4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,7 @@ [workspace] members = [ "associated-token-account/program", + "associated-token-account/program-test", "binary-option/program", "binary-oracle-pair/program", "examples/rust/cross-program-invocation", diff --git a/associated-token-account/program-test/Cargo.toml b/associated-token-account/program-test/Cargo.toml new file mode 100644 index 00000000..6c8d5280 --- /dev/null +++ b/associated-token-account/program-test/Cargo.toml @@ -0,0 +1,19 @@ +[package] +authors = ["Solana Maintainers "] +description = "SPL Associated Token Account Program Tests" +edition = "2018" +license = "Apache-2.0" +name = "spl-associated-token-account-test" +repository = "https://github.com/solana-labs/solana-program-library" +version = "0.0.1" + +[features] +test-bpf = [] + +[dev-dependencies] +solana-program = "1.10.33" +solana-program-test = "1.10.33" +solana-sdk = "1.10.33" +spl-associated-token-account = { version = "1.1", path = "../program", features = ["no-entrypoint"] } +spl-token = { version = "3.4", path = "../../token/program", features = ["no-entrypoint"] } +spl-token-2022 = { version = "0.4", path = "../../token/program-2022", features = ["no-entrypoint"] } diff --git a/associated-token-account/program/tests/create_idempotent.rs b/associated-token-account/program-test/tests/create_idempotent.rs similarity index 100% rename from associated-token-account/program/tests/create_idempotent.rs rename to associated-token-account/program-test/tests/create_idempotent.rs diff --git a/associated-token-account/program/tests/extended_mint.rs b/associated-token-account/program-test/tests/extended_mint.rs similarity index 100% rename from associated-token-account/program/tests/extended_mint.rs rename to associated-token-account/program-test/tests/extended_mint.rs diff --git a/associated-token-account/program/tests/fixtures/token-mint-data.bin b/associated-token-account/program-test/tests/fixtures/token-mint-data.bin similarity index 100% rename from associated-token-account/program/tests/fixtures/token-mint-data.bin rename to associated-token-account/program-test/tests/fixtures/token-mint-data.bin diff --git a/associated-token-account/program/tests/process_create_associated_token_account.rs b/associated-token-account/program-test/tests/process_create_associated_token_account.rs similarity index 100% rename from associated-token-account/program/tests/process_create_associated_token_account.rs rename to associated-token-account/program-test/tests/process_create_associated_token_account.rs diff --git a/associated-token-account/program/tests/program_test.rs b/associated-token-account/program-test/tests/program_test.rs similarity index 100% rename from associated-token-account/program/tests/program_test.rs rename to associated-token-account/program-test/tests/program_test.rs diff --git a/associated-token-account/program/tests/recover_nested.rs b/associated-token-account/program-test/tests/recover_nested.rs similarity index 100% rename from associated-token-account/program/tests/recover_nested.rs rename to associated-token-account/program-test/tests/recover_nested.rs diff --git a/associated-token-account/program/tests/spl_token_create.rs b/associated-token-account/program-test/tests/spl_token_create.rs similarity index 100% rename from associated-token-account/program/tests/spl_token_create.rs rename to associated-token-account/program-test/tests/spl_token_create.rs diff --git a/associated-token-account/program/Cargo.toml b/associated-token-account/program/Cargo.toml index e8b65cba..a6ac1d85 100644 --- a/associated-token-account/program/Cargo.toml +++ b/associated-token-account/program/Cargo.toml @@ -21,10 +21,6 @@ spl-token = { version = "3.4", path = "../../token/program", features = ["no-ent spl-token-2022 = { version = "0.4", path = "../../token/program-2022", features = ["no-entrypoint"] } thiserror = "1.0" -[dev-dependencies] -solana-program-test = "1.10.33" -solana-sdk = "1.10.33" - [lib] crate-type = ["cdylib", "lib"]