From 71c78bf56da29dc8b85cddc9da09eabf18131ee8 Mon Sep 17 00:00:00 2001
From: Darioush Jalali <darioush.jalali@avalabs.org>
Date: Tue, 16 Apr 2024 01:38:25 -0700
Subject: [PATCH] rpc: close Clients in tests (#29512)

---
 rpc/client_test.go    | 4 +++-
 rpc/websocket_test.go | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/rpc/client_test.go b/rpc/client_test.go
index ac02ad33cf..01c326afb0 100644
--- a/rpc/client_test.go
+++ b/rpc/client_test.go
@@ -253,6 +253,7 @@ func TestClientBatchRequestLimit(t *testing.T) {
 	defer server.Stop()
 	server.SetBatchLimits(2, 100000)
 	client := DialInProc(server)
+	defer client.Close()
 
 	batch := []BatchElem{
 		{Method: "foo"},
@@ -342,6 +343,7 @@ func testClientCancel(transport string, t *testing.T) {
 	default:
 		panic("unknown transport: " + transport)
 	}
+	defer client.Close()
 
 	// The actual test starts here.
 	var (
@@ -592,6 +594,7 @@ func TestClientSubscriptionChannelClose(t *testing.T) {
 
 	srv.RegisterName("nftest", new(notificationTestService))
 	client, _ := Dial(wsURL)
+	defer client.Close()
 
 	for i := 0; i < 100; i++ {
 		ch := make(chan int, 100)
@@ -708,7 +711,6 @@ func TestClientHTTP(t *testing.T) {
 		errc       = make(chan error, len(results))
 		wantResult = echoResult{"a", 1, new(echoArgs)}
 	)
-	defer client.Close()
 	for i := range results {
 		i := i
 		go func() {
diff --git a/rpc/websocket_test.go b/rpc/websocket_test.go
index 8d2bd9d802..c6ea325d29 100644
--- a/rpc/websocket_test.go
+++ b/rpc/websocket_test.go
@@ -187,6 +187,7 @@ func TestWebsocketPeerInfo(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer c.Close()
 
 	// Request peer information.
 	var connInfo PeerInfo
@@ -273,6 +274,7 @@ func TestClientWebsocketLargeMessage(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
+	defer c.Close()
 
 	var r string
 	if err := c.Call(&r, "test_largeResp"); err != nil {