From c53c5e616f04ae8b041bfb64309cbc7f3e70303a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felf=C3=B6ldi=20Zsolt?= <zsfelfoldi@gmail.com>
Date: Wed, 20 Mar 2019 09:35:05 +0100
Subject: [PATCH] les: fix peer id and reply error handling (#19289)

* les: fixed peer id format

* les: fixed peer reply error handling
---
 les/handler.go | 10 +++++++++-
 les/peer.go    |  5 ++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/les/handler.go b/les/handler.go
index 50c32fb95..7c290b717 100644
--- a/les/handler.go
+++ b/les/handler.go
@@ -329,6 +329,11 @@ func (pm *ProtocolManager) handle(p *peer) error {
 // handleMsg is invoked whenever an inbound message is received from a remote
 // peer. The remote connection is torn down upon returning any error.
 func (pm *ProtocolManager) handleMsg(p *peer) error {
+	select {
+	case err := <-p.errCh:
+		return err
+	default:
+	}
 	// Read the next message from the remote peer, and ensure it's fully consumed
 	msg, err := p.rw.ReadMsg()
 	if err != nil {
@@ -389,7 +394,10 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
 		if reply != nil {
 			p.queueSend(func() {
 				if err := reply.send(bv); err != nil {
-					p.errCh <- err
+					select {
+					case p.errCh <- err:
+					default:
+					}
 				}
 			})
 		}
diff --git a/les/peer.go b/les/peer.go
index 8b506de62..0c15add9c 100644
--- a/les/peer.go
+++ b/les/peer.go
@@ -98,15 +98,14 @@ type peer struct {
 }
 
 func newPeer(version int, network uint64, isTrusted bool, p *p2p.Peer, rw p2p.MsgReadWriter) *peer {
-	id := p.ID()
-
 	return &peer{
 		Peer:      p,
 		rw:        rw,
 		version:   version,
 		network:   network,
-		id:        fmt.Sprintf("%x", id),
+		id:        fmt.Sprintf("%x", p.ID().Bytes()),
 		isTrusted: isTrusted,
+		errCh:     make(chan error, 1),
 	}
 }