refactor: bpf test

MeteoraAg · Dec 19, 2024 · 8f39722 · 8f39722
1 parent 6b16b2c
commit 8f39722
Show file tree

Hide file tree

Showing 15 changed files with 22 additions and 6 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["programs/*", "cli", "market_making", "commons", "dlmm_interface"]
+members = ["cli", "market_making", "commons", "dlmm_interface"]
 resolver = "2"
 
 [workspace.dependencies]

diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@
 #### Quote Testing
 
 ```
-cd programs/lb_clmm/
-cargo test-bpf
+cargo t -p commons --test '*'
 ```
 
 #### SDK Testing
@@ -13,4 +12,4 @@ cargo test-bpf
 1. cd ts-client
 2. anchor localnet -- --features localnet
 3. pnpm run test
-```
+```
diff --git a/commons/Cargo.toml b/commons/Cargo.toml
@@ -13,3 +13,13 @@ anyhow = { workspace = true }
 lb_clmm = { path = "../programs/lb_clmm", features = ["cpi"] }
 tokio = { workspace = true, features = ["full", "parking_lot"] }
 bincode = "1.3.3"
+
+[dev-dependencies]
+anchor-lang = { workspace = true }
+anchor-spl = { workspace = true }
+solana-program-test = "1.16.0"
+solana-sdk = "1.16.0"
+async-trait = "0.1.52"
+assert_matches = "1.5.0"
+spl-associated-token-account = { workspace = true }
+solana-program = "1.16.0"
diff --git a/...s/lb_clmm/tests/artifacts/lb_clmm_prod.so → commons/tests/artifacts/lb_clmm_prod.so b/...s/lb_clmm/tests/artifacts/lb_clmm_prod.so → commons/tests/artifacts/lb_clmm_prod.so
diff --git a/...asKFF27WtHhsaCvK27tPFFWig/bin_array_1.bin → ...asKFF27WtHhsaCvK27tPFFWig/bin_array_1.bin b/...asKFF27WtHhsaCvK27tPFFWig/bin_array_1.bin → ...asKFF27WtHhsaCvK27tPFFWig/bin_array_1.bin
diff --git a/...asKFF27WtHhsaCvK27tPFFWig/bin_array_2.bin → ...asKFF27WtHhsaCvK27tPFFWig/bin_array_2.bin b/...asKFF27WtHhsaCvK27tPFFWig/bin_array_2.bin → ...asKFF27WtHhsaCvK27tPFFWig/bin_array_2.bin
diff --git a/...3mcUasKFF27WtHhsaCvK27tPFFWig/lb_pair.bin → ...3mcUasKFF27WtHhsaCvK27tPFFWig/lb_pair.bin b/...3mcUasKFF27WtHhsaCvK27tPFFWig/lb_pair.bin → ...3mcUasKFF27WtHhsaCvK27tPFFWig/lb_pair.bin
diff --git a/...h3mcUasKFF27WtHhsaCvK27tPFFWig/oracle.bin → ...h3mcUasKFF27WtHhsaCvK27tPFFWig/oracle.bin b/...h3mcUasKFF27WtHhsaCvK27tPFFWig/oracle.bin → ...h3mcUasKFF27WtHhsaCvK27tPFFWig/oracle.bin
diff --git a/...cUasKFF27WtHhsaCvK27tPFFWig/reserve_x.bin → ...cUasKFF27WtHhsaCvK27tPFFWig/reserve_x.bin b/...cUasKFF27WtHhsaCvK27tPFFWig/reserve_x.bin → ...cUasKFF27WtHhsaCvK27tPFFWig/reserve_x.bin
diff --git a/...cUasKFF27WtHhsaCvK27tPFFWig/reserve_y.bin → ...cUasKFF27WtHhsaCvK27tPFFWig/reserve_y.bin b/...cUasKFF27WtHhsaCvK27tPFFWig/reserve_y.bin → ...cUasKFF27WtHhsaCvK27tPFFWig/reserve_y.bin
diff --git a/...sKFF27WtHhsaCvK27tPFFWig/token_x_mint.bin → ...sKFF27WtHhsaCvK27tPFFWig/token_x_mint.bin b/...sKFF27WtHhsaCvK27tPFFWig/token_x_mint.bin → ...sKFF27WtHhsaCvK27tPFFWig/token_x_mint.bin
diff --git a/programs/lb_clmm/tests/helpers/mod.rs → commons/tests/helpers/mod.rs b/programs/lb_clmm/tests/helpers/mod.rs → commons/tests/helpers/mod.rs
diff --git a/programs/lb_clmm/tests/helpers/utils.rs → commons/tests/helpers/utils.rs b/programs/lb_clmm/tests/helpers/utils.rs → commons/tests/helpers/utils.rs
diff --git a/programs/lb_clmm/tests/test_swap.rs → commons/tests/test_swap.rs b/programs/lb_clmm/tests/test_swap.rs → commons/tests/test_swap.rs
@@ -1,4 +1,3 @@
-#![cfg(feature = "test-bpf")]
 mod helpers;
 use anchor_lang::prelude::*;
 use anchor_lang::solana_program::{instruction::Instruction, pubkey::Pubkey};
@@ -20,7 +19,7 @@ use utils::*;
 #[tokio::test]
 async fn test_swap() {
     let mut test = ProgramTest::default();
-
+    test.prefer_bpf(true);
     test.add_program("./tests/artifacts/lb_clmm_prod", lb_clmm::id(), None);
 
     let lb_pair = Pubkey::from_str("EtAdVRLFH22rjWh3mcUasKFF27WtHhsaCvK27tPFFWig").unwrap();