Small changes after review

p2p/client.go

@@ -174,6 +174,10 @@ func (c *Catchup) sendSyncRequest(peer *Peer) error {
 		zap.Uint32("startBlock", c.requestedStartBlock),
 		zap.Uint32("endBlock", c.requestedEndBlock))
 
-	return errors.Wrapf(peer.SendSyncRequest(c.requestedStartBlock, c.requestedEndBlock+1),
-		"send sync request to %s", peer.Address)
+	err := peer.SendSyncRequest(c.requestedStartBlock, c.requestedEndBlock+1)
+	if err != nil {
+		return errors.Wrapf(err, "send sync request to %s", peer.Address)
+	}
+
+	return nil
 }

p2p/peer.go

@@ -196,12 +196,15 @@ func (p *Peer) WriteP2PMessage(message eos.P2PMessage) (err error) {
 	encoder := eos.NewEncoder(buff)
 	err = encoder.Encode(packet)
 	if err != nil {
-		return err
+		return errors.Wrapf(err, "unable to encode message %s", message)
 	}
+
 	_, err = p.Write(buff.Bytes())
+	if err != nil {
+		return errors.Wrapf(err, "write msg to %s", p.Address)
+	}
 
-	err = errors.Wrapf(err, "write msg to %s err when send : %s", p.Address, message)
-	return
+	return nil
 }
 
 func (p *Peer) SendSyncRequest(startBlockNum uint32, endBlockNumber uint32) (err error) {
@@ -298,5 +301,10 @@ func (p *Peer) SendHandshake(info *HandshakeInfo) error {
 		Generation:               int16(1),
 	}
 
-	return errors.WithStack(p.WriteP2PMessage(handshake))
+	err = p.WriteP2PMessage(handshake)
+	if err != nil {
+		err = errors.Wrapf(err, "sending handshake to %s", p.Address)
+	}
+
+	return nil
 }

p2p/proxy.go

@@ -1,6 +1,8 @@
 package p2p
 
 import (
+	"fmt"
+
 	"github.com/pkg/errors"
 
 	"go.uber.org/zap"
@@ -112,6 +114,11 @@ func (p *Proxy) Start() error {
 	go p.read(p.Peer2, p.Peer1, errorChannel)
 
 	if p.Peer2.handshakeInfo != nil {
+		err := triggerHandshake(p.Peer2)
+		if err != nil {
+			return fmt.Errorf("connect and start: trigger handshake: %s", err)
+		}
+
 		return errors.Wrap(triggerHandshake(p.Peer2),
 			"connect and start: trigger handshake")
 	}