idreply when closed

contrib/codecs/websocket/client.go

@@ -29,8 +29,11 @@ func newClient(conn *websocket.Conn) (*Client, error) {
 }
 
 func (c *Client) Close() error {
+	if err := c.Client.Close(); err != nil {
+		return err
+	}
 	if err := c.conn.Close(websocket.StatusNormalClosure, ""); err != nil {
 		return err
 	}
-	return c.Client.Close()
+	return nil
 }

contrib/extension/subscription/client_test.go

@@ -173,7 +173,7 @@ func TestCloseClient(t *testing.T) {
 	}
 
 	go func() {
-		if err := cl.Close(); err != nil {
+		if err = cl.Close(); err != nil {
 			t.Error(err)
 		}
 	}()

pkg/clientutil/idreply.go

@@ -13,7 +13,7 @@ import (
 type IdReply struct {
 	id atomic.Int64
 
-	amClosed atomic.Bool
+	close  atomic.Bool
 	closed chan struct{}
 
 	chs map[string]chan msgOrError
@@ -109,7 +109,7 @@ func (i *IdReply) Closed() <-chan struct{} {
 }
 
 func (i *IdReply) Close() error {
-	if i.amClosed.Swap(true) {
+	if i.close.Swap(true) {
 		return net.ErrClosed
 	}
 	close(i.closed)

pkg/jrpctest/suites.go

@@ -3,9 +3,7 @@ package jrpctest
 import (
 	"context"
 	"embed"
-	"errors"
 	"math/rand"
-	"net"
 	"reflect"
 	"sync"
 	"testing"
@@ -190,16 +188,6 @@ func RunBasicTestSuite(t *testing.T, args BasicTestSuiteArgs) {
 		wg.Wait()
 	})
 
-	makeTest("close", func(t *testing.T, server *server.Server, client jsonrpc.Conn) {
-		go func() {
-			_ = client.Close()
-		}()
-		err := jsonrpc.CallInto(context.Background(), client, nil, "test_block")
-		if !errors.Is(err, net.ErrClosed) {
-			t.Errorf("expected close error but got %v", err)
-		}
-	})
-
 	makeTest("", func(t *testing.T, server *server.Server, client jsonrpc.Conn) {
 	})
 }