Move VSS integration tests to integration test folder

lightningdevkit · Dec 18, 2023 · a2089ae · a2089ae
1 parent 0627f84
commit a2089ae
Show file tree

Hide file tree

Showing 5 changed files with 300 additions and 37 deletions.
diff --git a/.github/workflows/vss-integration.yml b/.github/workflows/vss-integration.yml
@@ -74,8 +74,8 @@ jobs:
         run: |
           cd ldk-node
           export TEST_VSS_BASE_URL="http://localhost:8080/vss"
-          RUSTFLAGS="--cfg=vss_test --cfg=vss" cargo build --verbose --color always
-          RUSTFLAGS="--cfg=vss_test --cfg=vss" cargo test -- --nocapture
+          RUSTFLAGS="--cfg vss_test --cfg vss" cargo build --verbose --color always
+          RUSTFLAGS="--cfg vss_test --cfg vss" cargo test --test integration_tests_vss
 
       - name: Cleanup
         run: |

diff --git a/Cargo.toml b/Cargo.toml
@@ -78,12 +78,12 @@ lightning = { version = "0.0.118", features = ["std", "_test_utils"] }
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
 electrsd = { version = "0.22.0", features = ["legacy", "esplora_a33e97e1", "bitcoind_23_0"] }
 electrum-client = "0.12.0"
+bitcoincore-rpc = { version = "0.16.0", default-features = false }
 proptest = "1.0.0"
 regex = "1.5.6"
 
 [target.'cfg(cln_test)'.dev-dependencies]
 clightningrpc = { version = "0.3.0-beta.8", default-features = false }
-bitcoincore-rpc = { version = "0.16.0", default-features = false }
 
 [build-dependencies]
 uniffi = { version = "0.25.1", features = ["build"], optional = true }

diff --git a/src/test/functional_tests.rs b/src/test/functional_tests.rs
@@ -18,29 +18,6 @@ fn channel_full_cycle() {
 	do_channel_full_cycle(node_a, node_b, &bitcoind, &electrsd, false);
 }
 
-#[test]
-#[cfg(vss_test)]
-fn channel_full_cycle_with_vss_store() {
-	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();
-	println!("== Node A ==");
-	let esplora_url = format!("http://{}", electrsd.esplora_url.as_ref().unwrap());
-	let config_a = random_config();
-	let mut builder_a = NodeBuilder::from_config(config_a);
-	builder_a.set_esplora_server(esplora_url.clone());
-	let vss_base_url = std::env::var("TEST_VSS_BASE_URL").unwrap();
-	let node_a = builder_a.build_with_vss_store(&vss_base_url, "node_1_store".to_string()).unwrap();
-	node_a.start().unwrap();
-
-	println!("\n== Node B ==");
-	let config_b = random_config();
-	let mut builder_b = NodeBuilder::from_config(config_b);
-	builder_b.set_esplora_server(esplora_url);
-	let node_b = builder_b.build_with_vss_store(&vss_base_url, "node_2_store".to_string()).unwrap();
-	node_b.start().unwrap();
-
-	do_channel_full_cycle(node_a, node_b, &bitcoind, &electrsd, false);
-}
-
 #[test]
 fn channel_full_cycle_0conf() {
 	let (bitcoind, electrsd) = setup_bitcoind_and_electrsd();