From 137f2cb1927ce8a4598567f919b70cf5b4e22ccd Mon Sep 17 00:00:00 2001
From: Roman Khimov <roman@nspcc.ru>
Date: Wed, 12 Oct 2022 15:43:31 +0300
Subject: [PATCH] network: deduplicate TCPPeer code a bit

context.Background() is never canceled and has no deadline, so we can avoid
duplicating some code.
---
 pkg/network/tcp_peer.go | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/pkg/network/tcp_peer.go b/pkg/network/tcp_peer.go
index 7b0982390..9244716cc 100644
--- a/pkg/network/tcp_peer.go
+++ b/pkg/network/tcp_peer.go
@@ -81,9 +81,9 @@ func NewTCPPeer(conn net.Conn, s *Server) *TCPPeer {
 	}
 }
 
-// putBroadcastPacketIntoQueue puts the given message into the given queue if
+// putPacketIntoQueue puts the given message into the given queue if
 // the peer has done handshaking using the given context.
-func (p *TCPPeer) putBroadcastPacketIntoQueue(ctx context.Context, queue chan<- []byte, msg []byte) error {
+func (p *TCPPeer) putPacketIntoQueue(ctx context.Context, queue chan<- []byte, msg []byte) error {
 	if !p.Handshaked() {
 		return errStateMismatch
 	}
@@ -97,29 +97,15 @@ func (p *TCPPeer) putBroadcastPacketIntoQueue(ctx context.Context, queue chan<-
 	return nil
 }
 
-// putPacketIntoQueue puts the given message into the given queue if the peer has
-// done handshaking.
-func (p *TCPPeer) putPacketIntoQueue(queue chan<- []byte, msg []byte) error {
-	if !p.Handshaked() {
-		return errStateMismatch
-	}
-	select {
-	case queue <- msg:
-	case <-p.done:
-		return errGone
-	}
-	return nil
-}
-
 // BroadcastPacket implements the Peer interface.
 func (p *TCPPeer) BroadcastPacket(ctx context.Context, msg []byte) error {
-	return p.putBroadcastPacketIntoQueue(ctx, p.sendQ, msg)
+	return p.putPacketIntoQueue(ctx, p.sendQ, msg)
 }
 
 // BroadcastHPPacket implements the Peer interface. It the peer is not yet
 // handshaked it's a noop.
 func (p *TCPPeer) BroadcastHPPacket(ctx context.Context, msg []byte) error {
-	return p.putBroadcastPacketIntoQueue(ctx, p.hpSendQ, msg)
+	return p.putPacketIntoQueue(ctx, p.hpSendQ, msg)
 }
 
 // putMessageIntoQueue serializes the given Message and puts it into given queue if
@@ -129,7 +115,7 @@ func (p *TCPPeer) putMsgIntoQueue(queue chan<- []byte, msg *Message) error {
 	if err != nil {
 		return err
 	}
-	return p.putPacketIntoQueue(queue, b)
+	return p.putPacketIntoQueue(context.Background(), queue, b)
 }
 
 // EnqueueP2PMessage implements the Peer interface.