renamed handshake proto messages

pkg/p2p/libp2p/internal/handshake/handshake.go

@@ -6,6 +6,7 @@ package handshake
 
 import (
 	"fmt"
+
 	"github.com/ethersphere/bee/pkg/logging"
 	"github.com/ethersphere/bee/pkg/p2p"
 	"github.com/ethersphere/bee/pkg/p2p/libp2p/internal/handshake/pb"
@@ -35,8 +36,8 @@ func New(overlay swarm.Address, networkID int32, logger logging.Logger) *Service
 
 func (s *Service) Handshake(stream p2p.Stream) (i *Info, err error) {
 	w, r := protobuf.NewWriterAndReader(stream)
-	var resp pb.ShakeHandAck
-	if err := w.WriteMsg(&pb.ShakeHand{
+	var resp pb.SynPlusAck
+	if err := w.WriteMsg(&pb.Syn{
 		Address:   s.overlay.Bytes(),
 		NetworkID: s.networkID,
 	}); err != nil {
@@ -47,18 +48,18 @@ func (s *Service) Handshake(stream p2p.Stream) (i *Info, err error) {
 		return nil, fmt.Errorf("read message: %w", err)
 	}
 
-	if err := w.WriteMsg(&pb.Ack{Address: resp.ShakeHand.Address}); err != nil {
+	if err := w.WriteMsg(&pb.Ack{Address: resp.Syn.Address}); err != nil {
 		return nil, fmt.Errorf("ack: write message: %w", err)
 	}
 
-	address := swarm.NewAddress(resp.ShakeHand.Address)
+	address := swarm.NewAddress(resp.Syn.Address)
 
 	s.logger.Tracef("handshake finished for peer %s", address)
 
 	return &Info{
 		Address:   address,
-		NetworkID: resp.ShakeHand.NetworkID,
-		Light:     resp.ShakeHand.Light,
+		NetworkID: resp.Syn.NetworkID,
+		Light:     resp.Syn.Light,
 	}, nil
 }
 
@@ -66,13 +67,13 @@ func (s *Service) Handle(stream p2p.Stream) (i *Info, err error) {
 	w, r := protobuf.NewWriterAndReader(stream)
 	defer stream.Close()
 
-	var req pb.ShakeHand
+	var req pb.Syn
 	if err := r.ReadMsg(&req); err != nil {
 		return nil, fmt.Errorf("read message: %w", err)
 	}
 
-	if err := w.WriteMsg(&pb.ShakeHandAck{
-		ShakeHand: &pb.ShakeHand{
+	if err := w.WriteMsg(&pb.SynPlusAck{
+		Syn: &pb.Syn{
 			Address:   s.overlay.Bytes(),
 			NetworkID: s.networkID,
 		},

pkg/p2p/libp2p/internal/handshake/handshake_test.go

@@ -41,8 +41,8 @@ func TestHandshake(t *testing.T) {
 		stream2 := mock.NewStream(&buffer2, &buffer1)
 
 		w, r := protobuf.NewWriterAndReader(stream2)
-		if err := w.WriteMsg(&pb.ShakeHandAck{
-			ShakeHand: &pb.ShakeHand{
+		if err := w.WriteMsg(&pb.SynPlusAck{
+			Syn: &pb.Syn{
 				Address:   expectedInfo.Address.Bytes(),
 				NetworkID: expectedInfo.NetworkID,
 				Light:     expectedInfo.Light,
@@ -64,7 +64,7 @@ func TestHandshake(t *testing.T) {
 		}
 	})
 
-	t.Run("ERROR - shakehand write error ", func(t *testing.T) {
+	t.Run("ERROR - Syn write error ", func(t *testing.T) {
 		testErr := errors.New("test error")
 		expectedErr := fmt.Errorf("write message: %w", testErr)
 		stream := &mock.StreamMock{}
@@ -79,7 +79,7 @@ func TestHandshake(t *testing.T) {
 		}
 	})
 
-	t.Run("ERROR - shakehand read error ", func(t *testing.T) {
+	t.Run("ERROR - Syn read error ", func(t *testing.T) {
 		testErr := errors.New("test error")
 		expectedErr := fmt.Errorf("read message: %w", testErr)
 		stream := mock.NewStream(nil, &bytes.Buffer{})
@@ -110,8 +110,8 @@ func TestHandshake(t *testing.T) {
 		stream2 := mock.NewStream(&buffer2, &buffer1)
 
 		w, _ := protobuf.NewWriterAndReader(stream2)
-		if err := w.WriteMsg(&pb.ShakeHandAck{
-			ShakeHand: &pb.ShakeHand{
+		if err := w.WriteMsg(&pb.SynPlusAck{
+			Syn: &pb.Syn{
 				Address:   expectedInfo.Address.Bytes(),
 				NetworkID: expectedInfo.NetworkID,
 				Light:     expectedInfo.Light,
@@ -157,7 +157,7 @@ func TestHandle(t *testing.T) {
 		stream2 := mock.NewStream(&buffer2, &buffer1)
 
 		w, _ := protobuf.NewWriterAndReader(stream2)
-		if err := w.WriteMsg(&pb.ShakeHand{
+		if err := w.WriteMsg(&pb.Syn{
 			Address:   node2Info.Address.Bytes(),
 			NetworkID: node2Info.NetworkID,
 			Light:     node2Info.Light,
@@ -177,15 +177,15 @@ func TestHandle(t *testing.T) {
 		testInfo(t, *res, node2Info)
 
 		_, r := protobuf.NewWriterAndReader(stream2)
-		var got pb.ShakeHandAck
+		var got pb.SynPlusAck
 		if err := r.ReadMsg(&got); err != nil {
 			t.Fatal(err)
 		}
 
 		testInfo(t, nodeInfo, Info{
-			Address:   swarm.NewAddress(got.ShakeHand.Address),
-			NetworkID: got.ShakeHand.NetworkID,
-			Light:     got.ShakeHand.Light,
+			Address:   swarm.NewAddress(got.Syn.Address),
+			NetworkID: got.Syn.NetworkID,
+			Light:     got.Syn.Light,
 		})
 	})
 
@@ -211,7 +211,7 @@ func TestHandle(t *testing.T) {
 		stream := mock.NewStream(&buffer, &buffer)
 		stream.SetWriteErr(testErr, 1)
 		w, _ := protobuf.NewWriterAndReader(stream)
-		if err := w.WriteMsg(&pb.ShakeHand{
+		if err := w.WriteMsg(&pb.Syn{
 			Address:   node1Addr.Bytes(),
 			NetworkID: 0,
 			Light:     false,
@@ -244,7 +244,7 @@ func TestHandle(t *testing.T) {
 		stream2 := mock.NewStream(&buffer2, &buffer1)
 		stream1.SetReadErr(testErr, 1)
 		w, _ := protobuf.NewWriterAndReader(stream2)
-		if err := w.WriteMsg(&pb.ShakeHand{
+		if err := w.WriteMsg(&pb.Syn{
 			Address:   node2Info.Address.Bytes(),
 			NetworkID: node2Info.NetworkID,
 			Light:     node2Info.Light,

pkg/p2p/libp2p/internal/handshake/pb/handshake.proto

@@ -5,14 +5,14 @@ syntax = "proto3";
 
 package pb;
 
-message ShakeHand {
+message Syn {
     bytes Address = 1;
     int32 NetworkID = 2;
     bool Light = 3;
 }
 
-message ShakeHandAck {
-    ShakeHand ShakeHand = 1;
+message SynPlusAck {
+    Syn Syn = 1;
     Ack Ack = 2;
 }