From 446d022ead3c823ca11a8d922fc753da668ce50e Mon Sep 17 00:00:00 2001
From: Jesse de Wit <witdejesse@hotmail.com>
Date: Wed, 22 Nov 2023 21:45:47 +0100
Subject: [PATCH] don't test lsps2 with lnd client

---
 .github/workflows/integration_tests.yaml | 45 +++++++++++++++++++++---
 itest/lspd_test.go                       | 25 +++++++++----
 2 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
index 112a4eef..cd392714 100644
--- a/.github/workflows/integration_tests.yaml
+++ b/.github/workflows/integration_tests.yaml
@@ -92,10 +92,6 @@ jobs:
           testLsps2GetVersions,
           testLsps2GetInfo,
           testLsps2Buy,
-          testLsps2HappyFlow,
-          testLsps2Cltv,
-          testLsps2NoBalance,
-          testLsps2ZeroConfUtxo,
           testOpenZeroConfChannelOnReceive,
           testOpenZeroConfSingleHtlc,
           testZeroReserve,
@@ -122,7 +118,48 @@ jobs:
         exclude:
           - lsp: CLN
             client: LND
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Run and Process Test State
+        uses: ./.github/actions/test-lspd
+        with:
+          TESTRE: "TestLspd/${{ matrix.lsp }}-lsp-${{ matrix.client}}-client:_${{ matrix.test }}"
+          artifact-name: TestLspd-${{ matrix.lsp }}-lsp-${{ matrix.client}}-client_${{ matrix.test }}
+          bitcoin-version: ${{ env.BITCOIN_VERSION }}
+          LSP_REF: ${{ env.LSP_REF }}
+          CLIENT_REF: ${{ env.CLIENT_REF }}
+          GO_VERSION: ${{ env.GO_VERSION }}
+          CLN_VERSION: ${{ env.CLN_VERSION }}
+          timeout: 5m
 
+  run-lsps2-test:
+    runs-on: ubuntu-22.04
+    needs:
+      - setup-itest
+      - setup-bitcoin-core
+      - setup-lnd-client
+      - setup-lnd-lsp
+      - setup-cln
+      - build-lspd
+    name: test ${{ matrix.lsp }}-lsp ${{ matrix.client }}-client ${{ matrix.test }}
+    strategy:
+      max-parallel: 4
+      matrix:
+        test: [
+          testLsps2HappyFlow,
+          testLsps2Cltv,
+          testLsps2NoBalance,
+          testLsps2ZeroConfUtxo,
+        ]
+        lsp: [
+          LND,
+          CLN
+        ]
+        client: [
+          CLN
+        ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
diff --git a/itest/lspd_test.go b/itest/lspd_test.go
index a46d6c2e..4506b288 100644
--- a/itest/lspd_test.go
+++ b/itest/lspd_test.go
@@ -18,8 +18,14 @@ func TestLspd(t *testing.T) {
 		return
 	}
 	testCases := allTestCases
+	var lndLndTestCases []*testCase
+	for _, c := range testCases {
+		if !c.isLsps2 {
+			lndLndTestCases = append(lndLndTestCases, c)
+		}
+	}
 	runTests(t, testCases, "LND-lsp-CLN-client", lndLspFunc, clnClientFunc)
-	runTests(t, testCases, "LND-lsp-LND-client", legacyOnionLndLspFunc, lndClientFunc)
+	runTests(t, lndLndTestCases, "LND-lsp-LND-client", legacyOnionLndLspFunc, lndClientFunc)
 	runTests(t, testCases, "CLN-lsp-CLN-client", clnLspFunc, clnClientFunc)
 }
 
@@ -117,6 +123,7 @@ type testCase struct {
 	name          string
 	test          func(t *testParams)
 	skipCreateLsp bool
+	isLsps2       bool
 	timeout       time.Duration
 }
 
@@ -195,20 +202,24 @@ var allTestCases = []*testCase{
 		test: testLsps2Buy,
 	},
 	{
-		name: "testLsps2HappyFlow",
-		test: testLsps2HappyFlow,
+		name:    "testLsps2HappyFlow",
+		test:    testLsps2HappyFlow,
+		isLsps2: true,
 	},
 	{
-		name: "testLsps2Cltv",
-		test: testLsps2Cltv,
+		name:    "testLsps2Cltv",
+		test:    testLsps2Cltv,
+		isLsps2: true,
 	},
 	{
-		name: "testLsps2NoBalance",
-		test: testLsps2NoBalance,
+		name:    "testLsps2NoBalance",
+		test:    testLsps2NoBalance,
+		isLsps2: true,
 	},
 	{
 		name:          "testLsps2ZeroConfUtxo",
 		test:          testLsps2ZeroConfUtxo,
+		isLsps2:       true,
 		skipCreateLsp: true,
 	},
 }