test: fire-and-forget CLN swap rpc

Author: YusukeShimizu

test/recovery_test.go

@@ -8,7 +8,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/elementsproject/glightning/jrpc2"
 	"github.com/elementsproject/peerswap/clightning"
 	"github.com/elementsproject/peerswap/premium"
 	"github.com/elementsproject/peerswap/swap"
@@ -19,28 +18,45 @@ type clnSocketProvider interface {
 	GetDataDir() string
 }
 
-func notifyCLN(t *testing.T, node clnSocketProvider, method jrpc2.Method) {
+func fireAndForgetCLNRPC(t *testing.T, node clnSocketProvider, method string, params any) {
 	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,
+	t.Cleanup(func() { _ = conn.Close() })
+
+	rawParams, err := json.Marshal(params)
+	require.NoError(err)
+
+	req := struct {
+		JSONRPC string          `json:"jsonrpc"`
+		ID      int             `json:"id"`
+		Method  string          `json:"method"`
+		Params  json.RawMessage `json:"params"`
+	}{
+		JSONRPC: "2.0",
+		ID:      1,
+		Method:  method,
+		Params:  rawParams,
 	}
 	payload, err := json.Marshal(req)
 	require.NoError(err)
 
 	_, err = conn.Write(append(payload, '\n', '\n'))
 	require.NoError(err)
+
+	// Drain any responses to avoid backpressure, but never block the test.
+	go func() {
+		buf := make([]byte, 4096)
+		for {
+			if _, err := conn.Read(buf); err != nil {
+				return
+			}
+		}
+	}()
 }
 
 // Test_RestoreFromPassedCSV checks the following scenario: A swap is initiated
@@ -92,7 +108,7 @@ func Test_RestoreFromPassedCSV(t *testing.T) {
 	asset := "btc"
 
 	// Do swap.
-	notifyCLN(t, lightningds[0], &clightning.SwapOut{
+	fireAndForgetCLNRPC(t, lightningds[0], "peerswap-swap-out", &clightning.SwapOut{
 		SatAmt:              params.swapAmt,
 		ShortChannelId:      params.scid,
 		Asset:               asset,
@@ -225,7 +241,7 @@ func Test_Recover_PassedSwap_BTC(t *testing.T) {
 	asset := "btc"
 
 	// Do swap.
-	notifyCLN(t, lightningds[0], &clightning.SwapOut{
+	fireAndForgetCLNRPC(t, lightningds[0], "peerswap-swap-out", &clightning.SwapOut{
 		SatAmt:              params.swapAmt,
 		ShortChannelId:      params.scid,
 		Asset:               asset,
@@ -331,7 +347,7 @@ func Test_Recover_PassedSwap_LBTC(t *testing.T) {
 	asset := "lbtc"
 
 	// Do swap.
-	notifyCLN(t, lightningds[0], &clightning.SwapOut{
+	fireAndForgetCLNRPC(t, lightningds[0], "peerswap-swap-out", &clightning.SwapOut{
 		SatAmt:              params.swapAmt,
 		ShortChannelId:      params.scid,
 		Asset:               asset,