Commit 853ac30f authored by Petar Radovic's avatar Petar Radovic

minor handshake error messages fix

parent 194b94b1
......@@ -39,19 +39,19 @@ func (s *Service) Handshake(stream p2p.Stream) (i *Info, err error) {
Address: s.overlay,
NetworkID: s.networkID,
}); err != nil {
return nil, fmt.Errorf("handshake write message: %w", err)
return nil, fmt.Errorf("write message: %w", err)
}
s.logger.Tracef("handshake sent request %s", s.overlay)
if err := r.ReadMsg(&resp); err != nil {
return nil, fmt.Errorf("handshake read message: %w", err)
return nil, fmt.Errorf("read message: %w", err)
}
if err := w.WriteMsg(&pb.Ack{Address: resp.ShakeHand.Address}); err != nil {
return nil, fmt.Errorf("ack write message: %w", err)
return nil, fmt.Errorf("ack: write message: %w", err)
}
s.logger.Tracef("handshake read response: %s", resp.ShakeHand.Address)
s.logger.Debugf("handshake finished for peer %s", resp.ShakeHand.Address)
return &Info{
Address: resp.ShakeHand.Address,
NetworkID: resp.ShakeHand.NetworkID,
......@@ -65,10 +65,9 @@ func (s *Service) Handle(stream p2p.Stream) (i *Info, err error) {
var req pb.ShakeHand
if err := r.ReadMsg(&req); err != nil {
return nil, fmt.Errorf("handshake handler read message: %w", err)
return nil, fmt.Errorf("read message: %w", err)
}
s.logger.Tracef("handshake handler received request %s", req.Address)
if err := w.WriteMsg(&pb.ShakeHandAck{
ShakeHand: &pb.ShakeHand{
Address: s.overlay,
......@@ -76,15 +75,15 @@ func (s *Service) Handle(stream p2p.Stream) (i *Info, err error) {
},
Ack: &pb.Ack{Address: req.Address},
}); err != nil {
return nil, fmt.Errorf("handshake handler write message: %w", err)
return nil, fmt.Errorf("write message: %w", err)
}
var ack pb.Ack
if err := r.ReadMsg(&ack); err != nil {
return nil, fmt.Errorf("ack read message: %w", err)
return nil, fmt.Errorf("ack: read message: %w", err)
}
s.logger.Tracef("handshake handled response: %s", s.overlay)
s.logger.Debugf("handshake finished for peer %s", req.Address)
return &Info{
Address: req.Address,
NetworkID: req.NetworkID,
......
......@@ -109,7 +109,7 @@ func TestHandshake(t *testing.T) {
t.Run("ERROR - shakehand write error ", func(t *testing.T) {
testErr := errors.New("test error")
expectedErr := fmt.Errorf("handshake write message: %w", testErr)
expectedErr := fmt.Errorf("write message: %w", testErr)
stream := &StreamMock{}
stream.setWriteErr(testErr, 0)
res, err := handshakeService.Handshake(stream)
......@@ -124,7 +124,7 @@ func TestHandshake(t *testing.T) {
t.Run("ERROR - shakehand read error ", func(t *testing.T) {
testErr := errors.New("test error")
expectedErr := fmt.Errorf("handshake read message: %w", testErr)
expectedErr := fmt.Errorf("read message: %w", testErr)
stream := &StreamMock{writeBuffer: &bytes.Buffer{}}
stream.setReadErr(testErr, 0)
res, err := handshakeService.Handshake(stream)
......@@ -139,7 +139,7 @@ func TestHandshake(t *testing.T) {
t.Run("ERROR - ack write error ", func(t *testing.T) {
testErr := errors.New("test error")
expectedErr := fmt.Errorf("ack write message: %w", testErr)
expectedErr := fmt.Errorf("ack: write message: %w", testErr)
expectedInfo := Info{
Address: "node2",
......@@ -233,7 +233,7 @@ func TestHandle(t *testing.T) {
t.Run("ERROR - read error ", func(t *testing.T) {
testErr := errors.New("test error")
expectedErr := fmt.Errorf("handshake handler read message: %w", testErr)
expectedErr := fmt.Errorf("read message: %w", testErr)
stream := &StreamMock{}
stream.setReadErr(testErr, 0)
res, err := handshakeService.Handle(stream)
......@@ -248,7 +248,7 @@ func TestHandle(t *testing.T) {
t.Run("ERROR - write error ", func(t *testing.T) {
testErr := errors.New("test error")
expectedErr := fmt.Errorf("handshake handler write message: %w", testErr)
expectedErr := fmt.Errorf("write message: %w", testErr)
var buffer bytes.Buffer
stream := &StreamMock{readBuffer: &buffer, writeBuffer: &buffer}
stream.setWriteErr(testErr, 1)
......@@ -273,7 +273,7 @@ func TestHandle(t *testing.T) {
t.Run("ERROR - ack read error ", func(t *testing.T) {
testErr := errors.New("test error")
expectedErr := fmt.Errorf("ack read message: %w", testErr)
expectedErr := fmt.Errorf("ack: read message: %w", testErr)
node2Info := Info{
Address: "node2",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment