f: move 0FC eclair interop test to eclair workflow

Author: tankyleo

.github/workflows/0fc-integration.yml

@@ -47,54 +47,3 @@ jobs:
       - name: Test with 0FC enabled
         run: |
           RUSTFLAGS="--cfg no_download --cfg cycle_tests --cfg tokio_unstable --cfg zero_fee_commitment_tests" cargo test -- --test-threads=1
-  eclair-interop-test:
-    timeout-minutes: 60
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Start bitcoind and electrs
-        run: docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml up -d bitcoin electrs
-
-      - name: Wait for bitcoind to be healthy
-        run: |
-          for i in $(seq 1 30); do
-            if docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml exec bitcoin bitcoin-cli -regtest -rpcuser=user -rpcpassword=pass getblockchaininfo > /dev/null 2>&1; then
-              echo "bitcoind is ready"
-              exit 0
-            fi
-            echo "Waiting for bitcoind... ($i/30)"
-            sleep 2
-          done
-          echo "ERROR: bitcoind not ready"
-          exit 1
-
-      - name: Create wallets on bitcoind
-        run: |
-          docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml exec bitcoin bitcoin-cli -regtest -rpcuser=user -rpcpassword=pass createwallet eclair
-          docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml exec bitcoin bitcoin-cli -regtest -rpcuser=user -rpcpassword=pass -rpcwallet=eclair getnewaddress
-          docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml exec bitcoin bitcoin-cli -regtest -rpcuser=user -rpcpassword=pass createwallet ldk_node_test
-
-      - name: Start Eclair with 0FC enabled
-        env:
-          ECLAIR_EXTRA_JAVA_OPTS: "-Declair.features.zero_fee_commitments=optional"
-        run: docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml up -d eclair
-
-      - name: Wait for Eclair to be ready
-        run: |
-          for i in $(seq 1 60); do
-            if curl -sf -u :eclairpassword -X POST http://127.0.0.1:8080/getinfo > /dev/null 2>&1; then
-              echo "Eclair is ready"
-              exit 0
-            fi
-            echo "Waiting for Eclair... ($i/60)"
-            sleep 5
-          done
-          echo "Eclair failed to start"
-          docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml logs eclair
-          exit 1
-
-      - name: Run Eclair 0FC integration tests
-        run: |
-          RUSTFLAGS="--cfg eclair_test --cfg zero_fee_commitment_tests" cargo test --test integration_tests_eclair -- --show-output --test-threads=1

.github/workflows/eclair-integration.yml

@@ -8,8 +8,19 @@ concurrency:
 
 jobs:
   check-eclair:
+    name: check-eclair (${{ matrix.name }})
     timeout-minutes: 60
     runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - name: standard
+            eclair_extra_java_opts: ""
+            rustflags: "--cfg eclair_test"
+          - name: zero-fee-commitments
+            eclair_extra_java_opts: "-Declair.features.zero_fee_commitments=optional"
+            rustflags: "--cfg eclair_test --cfg zero_fee_commitment_tests"
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -37,6 +48,8 @@ jobs:
           docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml exec bitcoin bitcoin-cli -regtest -rpcuser=user -rpcpassword=pass createwallet ldk_node_test
 
       - name: Start Eclair
+        env:
+          ECLAIR_EXTRA_JAVA_OPTS: ${{ matrix.eclair_extra_java_opts }}
         run: docker compose -p ldk-node -f tests/docker/docker-compose-eclair.yml up -d eclair
 
       - name: Wait for Eclair to be ready
@@ -54,4 +67,5 @@ jobs:
           exit 1
 
       - name: Run Eclair integration tests
-        run: RUSTFLAGS="--cfg eclair_test" cargo test --test integration_tests_eclair -- --show-output --test-threads=1
+        run: |
+          RUSTFLAGS="${{ matrix.rustflags }}" cargo test --test integration_tests_eclair -- --show-output --test-threads=1

tests/common/scenarios/channel.rs

@@ -9,6 +9,8 @@ use std::time::Duration;
 
 use electrsd::corepc_node::Client as BitcoindClient;
 use electrsd::electrum_client::ElectrumApi;
+#[cfg(all(eclair_test, zero_fee_commitment_tests))]
+use ldk_node::ReserveType;
 use ldk_node::{Event, Node};
 
 use super::super::external_node::ExternalNode;
@@ -41,6 +43,21 @@ pub(crate) async fn open_channel_to_external<E: ElectrumApi>(
 		.map(|ch| ch.channel_id.clone())
 		.unwrap_or_else(|| panic!("Could not find channel on external node {}", peer.name()));
 
+	#[cfg(all(eclair_test, zero_fee_commitment_tests))]
+	{
+		let channel = node
+			.list_channels()
+			.into_iter()
+			.find(|channel| channel.user_channel_id == user_channel_id)
+			.expect("opened channel should be listed");
+		let channel_type = channel.channel_type.as_ref().expect("channel type should be set");
+		assert_eq!(channel.counterparty.node_id, ext_node_id);
+		assert!(channel.counterparty.features.supports_anchor_zero_fee_commitments());
+		assert!(channel_type.requires_anchor_zero_fee_commitments());
+		assert_eq!(channel.feerate_sat_per_1000_weight, 0);
+		assert_eq!(channel.reserve_type, Some(ReserveType::Adaptive));
+	}
+
 	(user_channel_id, ext_channel_id)
 }
 

tests/common/scenarios/mod.rs

@@ -20,8 +20,6 @@ use std::time::Duration;
 use bitcoin::Amount;
 use electrsd::corepc_node::Client as BitcoindClient;
 use electrsd::electrum_client::ElectrumApi;
-#[cfg(zero_fee_commitment_tests)]
-use ldk_node::ReserveType;
 use ldk_node::{Event, Node};
 
 use super::external_node::ExternalNode;
@@ -166,20 +164,6 @@ pub(crate) async fn basic_channel_cycle_scenario<E: ElectrumApi>(
 	)
 	.await;
 
-	#[cfg(zero_fee_commitment_tests)]
-	{
-		let ext_node_id = peer.get_node_id().await.unwrap();
-		let channel = node
-			.list_channels()
-			.into_iter()
-			.find(|channel| channel.user_channel_id == user_ch)
-			.expect("opened channel should be listed");
-		assert_eq!(channel.counterparty.node_id, ext_node_id);
-		assert!(channel.counterparty.features.supports_anchor_zero_fee_commitments());
-		assert_eq!(channel.feerate_sat_per_1000_weight, 0);
-		assert_eq!(channel.reserve_type, Some(ReserveType::Adaptive));
-	}
-
 	payment::send_bolt11_to_peer(node, peer, 10_000_000, "basic-send").await;
 	payment::receive_bolt11_payment(node, peer, 10_000_000).await;