requests, client, conn: close all rpc signal channels if handler goroutine for client exits

node/test, node/bench: make idle timeout test less flaky by allowing for io.EOF instead of noise.ErrMessageTooLarge, and remove parallelism for rpc benchmark
id/test: make test less flaky

Author: iwasaki-kenta

client.go

@@ -284,6 +284,9 @@ func (c *Client) request(ctx context.Context, data []byte) (message, error) {
 
 	select {
 	case msg = <-ch:
+		if msg.nonce == 0 {
+			return message{}, io.EOF
+		}
 	case <-ctx.Done():
 		return message{}, ctx.Err()
 	}
@@ -470,6 +473,7 @@ func (c *Client) handshake(ctx context.Context) {
 
 func (c *Client) handleLoop() {
 	defer close(c.handlerDone)
+	defer c.requests.close()
 
 	for {
 		msg, err := c.recv(context.Background())

error.go

@@ -3,5 +3,7 @@ package noise
 import "errors"
 
 var (
+	// ErrMessageTooLarge is reported by a client when it receives a message from a peer that exceeds the max
+	// receivable message size limit configured on a node.
 	ErrMessageTooLarge = errors.New("msg from peer is too large")
 )

id_test.go

@@ -15,7 +15,11 @@ func TestID_String(t *testing.T) {
 	t.Parallel()
 
 	f := func(publicKey noise.PublicKey, host net.IP, port uint16) bool {
-		h := host.String() // Make-shift 'normalizeIP(net.IP)'.
+		if host.IsLoopback() || host.IsUnspecified() { // Make-shift 'normalizeIP(net.IP)'.
+			host = nil
+		}
+
+		h := host.String()
 		if h == "<nil>" {
 			h = ""
 		}

map.go

@@ -146,3 +146,13 @@ func (r *requestMap) findRequest(nonce uint64) chan<- message {
 
 	return ch
 }
+
+func (r *requestMap) close() {
+	r.Lock()
+	defer r.Unlock()
+
+	for nonce := range r.entries {
+		close(r.entries[nonce])
+		delete(r.entries, nonce)
+	}
+}

node_options.go

@@ -48,9 +48,9 @@ func WithNodeMaxOutboundConnections(maxOutboundConnections uint) NodeOption {
 	}
 }
 
-// WithNodeMaxRecvSize sets the max number of bytes a node is willing to receive from a peer. If the limit is ever
-// exceeded, the peer is disconnected with an error. Setting this option to zero will disable the limit. By default,
-// the max number of bytes a node is willing to receive from a peer is set to 2MB.
+// WithNodeMaxRecvMessageSize sets the max number of bytes a node is willing to receive from a peer. If the limit is
+// ever exceeded, the peer is disconnected with an error. Setting this option to zero will disable the limit. By
+// default, the max number of bytes a node is willing to receive from a peer is set to 2MB.
 func WithNodeMaxRecvMessageSize(maxRecvMessageSize uint32) NodeOption {
 	return func(n *Node) {
 		n.maxRecvMessageSize = maxRecvMessageSize

node_test.go

@@ -371,7 +371,7 @@ func TestWithNodeMaxRecvMessageSize(t *testing.T) {
 
 	client := a.Inbound()[0]
 	client.WaitUntilClosed()
-	assert.True(t, errors.Is(client.Error(), noise.ErrMessageTooLarge))
+	assert.True(t, errors.Is(client.Error(), noise.ErrMessageTooLarge) || errors.Is(client.Error(), io.EOF))
 }
 
 func BenchmarkRPC(b *testing.B) {