From 4c006eb3735256ba2f17b6c2a56cc22c168b4330 Mon Sep 17 00:00:00 2001 From: Anton Evangelatov Date: Wed, 15 Nov 2017 15:53:28 +0100 Subject: [PATCH] Revert "p2p: add error check to SetWriteDeadline call in rlpx" This reverts commit aaaf75d26ec5a4e480920039950961e484bd2d8c. --- p2p/rlpx.go | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/p2p/rlpx.go b/p2p/rlpx.go index b97f9e89c0..24037ecc13 100644 --- a/p2p/rlpx.go +++ b/p2p/rlpx.go @@ -108,9 +108,8 @@ func (t *rlpx) close(err error) { // Tell the remote end why we're disconnecting if possible. if t.rw != nil { if r, ok := err.(DiscReason); ok && r != DiscNetworkError { - if err = t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)); err == nil { - SendItems(t.rw, discMsg, r) - } + t.fd.SetWriteDeadline(time.Now().Add(discWriteTimeout)) + SendItems(t.rw, discMsg, r) } } t.fd.Close()