test: avoid glightning pending RPC during CLN stop

Author: YusukeShimizu

test/recovery_test.go

@@ -1,15 +1,48 @@
 package test
 
 import (
+	"encoding/json"
 	"math"
+	"net"
+	"path/filepath"
 	"testing"
+	"time"
 
+	"github.com/elementsproject/glightning/jrpc2"
 	"github.com/elementsproject/peerswap/clightning"
 	"github.com/elementsproject/peerswap/premium"
 	"github.com/elementsproject/peerswap/swap"
 	"github.com/elementsproject/peerswap/testframework"
 )
 
+type clnSocketProvider interface {
+	GetDataDir() string
+}
+
+func notifyCLN(t *testing.T, node clnSocketProvider, method jrpc2.Method) {
+	t.Helper()
+
+	require := requireNew(t)
+
+	socketPath := filepath.Join(node.GetDataDir(), "lightning-rpc")
+	conn, err := net.DialTimeout("unix", socketPath, 1*time.Second)
+	require.NoError(err)
+	defer conn.Close()
+
+	req := &jrpc2.Request{
+		// No id means this is treated as a JSON-RPC notification, and no
+		// response is expected. This avoids leaving a long-running pending RPC
+		// request in glightning when the node is intentionally stopped mid-test.
+		Id:     nil,
+		Method: method,
+	}
+	payload, err := json.Marshal(req)
+	require.NoError(err)
+
+	_, err = conn.Write(append(payload, '\n', '\n'))
+	require.NoError(err)
+}
+
 // Test_RestoreFromPassedCSV checks the following scenario: A swap is initiated
 // and the opening tx is broadcasted. The maker node then goes offline before
 // the opening tx is confirmed such that the taker node can not pay the invoice.
@@ -59,18 +92,12 @@ func Test_RestoreFromPassedCSV(t *testing.T) {
 	asset := "btc"
 
 	// Do swap.
-	go func() {
-		// We need to run this in a go routine as the Request call is blocking and sometimes does not return.
-		var response map[string]interface{}
-		if err := lightningds[0].Rpc.Request(&clightning.SwapOut{
-			SatAmt:              params.swapAmt,
-			ShortChannelId:      params.scid,
-			Asset:               asset,
-			PremiumLimitRatePPM: params.premiumLimitRatePPM,
-		}, &response); err != nil {
-			t.Errorf("SwapOut request failed: %v", err)
-		}
-	}()
+	notifyCLN(t, lightningds[0], &clightning.SwapOut{
+		SatAmt:              params.swapAmt,
+		ShortChannelId:      params.scid,
+		Asset:               asset,
+		PremiumLimitRatePPM: params.premiumLimitRatePPM,
+	})
 
 	var premiumAmt uint64
 	if params.swapType == swap.SWAPTYPE_OUT {
@@ -198,18 +225,12 @@ func Test_Recover_PassedSwap_BTC(t *testing.T) {
 	asset := "btc"
 
 	// Do swap.
-	go func() {
-		// We need to run this in a go routine as the Request call is blocking and sometimes does not return.
-		var response map[string]interface{}
-		if err := lightningds[0].Rpc.Request(&clightning.SwapOut{
-			SatAmt:              params.swapAmt,
-			ShortChannelId:      params.scid,
-			Asset:               asset,
-			PremiumLimitRatePPM: params.premiumLimitRatePPM,
-		}, &response); err != nil {
-			t.Errorf("SwapOut request failed: %v", err)
-		}
-	}()
+	notifyCLN(t, lightningds[0], &clightning.SwapOut{
+		SatAmt:              params.swapAmt,
+		ShortChannelId:      params.scid,
+		Asset:               asset,
+		PremiumLimitRatePPM: params.premiumLimitRatePPM,
+	})
 
 	var premiumAmt uint64
 	if params.swapType == swap.SWAPTYPE_OUT {
@@ -310,18 +331,12 @@ func Test_Recover_PassedSwap_LBTC(t *testing.T) {
 	asset := "lbtc"
 
 	// Do swap.
-	go func() {
-		// We need to run this in a go routine as the Request call is blocking and sometimes does not return.
-		var response map[string]interface{}
-		if err := lightningds[0].Rpc.Request(&clightning.SwapOut{
-			SatAmt:              params.swapAmt,
-			ShortChannelId:      params.scid,
-			Asset:               asset,
-			PremiumLimitRatePPM: params.premiumLimitRatePPM,
-		}, &response); err != nil {
-			t.Errorf("SwapOut request failed: %v", err)
-		}
-	}()
+	notifyCLN(t, lightningds[0], &clightning.SwapOut{
+		SatAmt:              params.swapAmt,
+		ShortChannelId:      params.scid,
+		Asset:               asset,
+		PremiumLimitRatePPM: params.premiumLimitRatePPM,
+	})
 
 	var premiumAmt uint64
 	if params.swapType == swap.SWAPTYPE_OUT {