fix the lsps2 cltv delta check

It was wrongly assumed that the lsp had to enforce a cltv delta +2. It is actually the recipient creating invoices with a cltv delta +2, but the LSP does not have anything to do with that.
breez · Jan 19, 2024 · 833c79e · 833c79e
1 parent fc6c598
commit 833c79e
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 78 deletions.
diff --git a/.github/workflows/integration_tests.yaml b/.github/workflows/integration_tests.yaml
@@ -153,7 +153,6 @@ jobs:
           testLsps2GetInfo,
           testLsps2Buy,
           testLsps2HappyFlow,
-          testLsps2Cltv,
           testLsps2NoBalance,
           testLsps2ZeroConfUtxo
         ]

diff --git a/itest/lspd_test.go b/itest/lspd_test.go
@@ -210,11 +210,6 @@ var allTestCases = []*testCase{
 		test:    testLsps2HappyFlow,
 		isLsps2: true,
 	},
-	{
-		name:    "testLsps2Cltv",
-		test:    testLsps2Cltv,
-		isLsps2: true,
-	},
 	{
 		name:    "testLsps2NoBalance",
 		test:    testLsps2NoBalance,

diff --git a/itest/lsps2_cltv_test.go b/itest/lsps2_cltv_test.go
diff --git a/lsps2/intercept_handler.go b/lsps2/intercept_handler.go
@@ -278,9 +278,9 @@ func (i *Interceptor) processPart(payment *paymentState, part *partState) {
 		}
 	}
 
-	// Make sure the cltv delta is enough (actual cltv delta + 2).
+	// Make sure the cltv delta is enough.
 	if int64(part.req.IncomingExpiry)-int64(part.req.OutgoingExpiry) <
-		int64(i.config.TimeLockDelta)+2 {
+		int64(i.config.TimeLockDelta) {
 		i.failPart(payment, part, common.FAILURE_INCORRECT_CLTV_EXPIRY)
 		return
 	}

diff --git a/lsps2/intercept_test.go b/lsps2/intercept_test.go
@@ -314,13 +314,13 @@ func Test_NoMpp_AmtAboveMaximum(t *testing.T) {
 }
 
 // Asserts that a no-MPP+var-invoice mode payment fails when the cltv delta is
-// less than cltv delta + 2.
+// less than cltv delta.
 func Test_NoMpp_CltvDeltaBelowMinimum(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	i := setupInterceptor(ctx, nil)
 
-	res := i.Intercept(createPart(&part{cltvDelta: 145}))
+	res := i.Intercept(createPart(&part{cltvDelta: 143}))
 	assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
 	assert.Equal(t, common.FAILURE_INCORRECT_CLTV_EXPIRY, res.FailureCode)
 	assertEmpty(t, i)
@@ -533,13 +533,13 @@ func Test_Mpp_BadSecondPart_ThirdPartCompletes(t *testing.T) {
 }
 
 // Asserts that a MPP+fixed-invoice mode payment fails when the cltv delta is
-// less than cltv delta + 2.
+// less than cltv delta.
 func Test_Mpp_CltvDeltaBelowMinimum(t *testing.T) {
 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()
 	i := setupInterceptor(ctx, &interceptP{store: mppStore()})
 
-	res := i.Intercept(createPart(&part{cltvDelta: 145}))
+	res := i.Intercept(createPart(&part{cltvDelta: 143}))
 	assert.Equal(t, common.INTERCEPT_FAIL_HTLC_WITH_CODE, res.Action)
 	assert.Equal(t, common.FAILURE_INCORRECT_CLTV_EXPIRY, res.FailureCode)
 	assertEmpty(t, i)