Merge pull request #36 from libp2p/proto-field-rename

Rename protobuf fields in handshake payload
libp2p · Jan 29, 2020 · a57e711 · a57e711
2 parents e616482 + a82be49
commit a57e711
Show file tree

Hide file tree

Showing 8 changed files with 390 additions and 60 deletions.
diff --git a/p2p/security/noise/ik/IK_test.go b/p2p/security/noise/ik/IK_test.go
@@ -55,8 +55,8 @@ func TestHandshake(t *testing.T) {
 	// stage 0: initiator
 	// create payload
 	payload_init := new(pb.NoiseHandshakePayload)
-	payload_init.Libp2PKey = libp2p_pub_init_raw
-	payload_init.NoiseStaticKeySignature = libp2p_init_signed_payload
+	payload_init.IdentityKey = libp2p_pub_init_raw
+	payload_init.IdentitySig = libp2p_init_signed_payload
 	payload_init_enc, err := proto.Marshal(payload_init)
 	if err != nil {
 		t.Fatalf("proto marshal payload fail: %s", err)
@@ -84,8 +84,8 @@ func TestHandshake(t *testing.T) {
 	// stage 1: responder
 	// create payload
 	payload_resp := new(pb.NoiseHandshakePayload)
-	payload_resp.Libp2PKey = libp2p_pub_resp_raw
-	payload_resp.NoiseStaticKeySignature = libp2p_resp_signed_payload
+	payload_resp.IdentityKey = libp2p_pub_resp_raw
+	payload_resp.IdentitySig = libp2p_resp_signed_payload
 	payload_resp_enc, err := proto.Marshal(payload_resp)
 	if err != nil {
 		t.Fatalf("proto marshal payload fail: %s", err)

diff --git a/p2p/security/noise/ik_handshake.go b/p2p/security/noise/ik_handshake.go
@@ -122,7 +122,7 @@ func (s *secureSession) runHandshake_ik(ctx context.Context, payload []byte) ([]
 		}
 
 		// set remote libp2p public key
-		err = s.setRemotePeerInfo(nhp.GetLibp2PKey())
+		err = s.setRemotePeerInfo(nhp.GetIdentityKey())
 		if err != nil {
 			log.Errorf("runHandshake_ik stage=1 initiator=true set remote peer info err=%s", err)
 			return buf, fmt.Errorf("runHandshake_ik stage=1 initiator=true err=read remote libp2p key fail")
@@ -161,7 +161,7 @@ func (s *secureSession) runHandshake_ik(ctx context.Context, payload []byte) ([]
 		}
 
 		// set remote libp2p public key
-		err = s.setRemotePeerInfo(nhp.GetLibp2PKey())
+		err = s.setRemotePeerInfo(nhp.GetIdentityKey())
 		if err != nil {
 			return buf, fmt.Errorf("runHandshake_ik stage=0 initiator=false err=read remote libp2p key fail")
 		}

diff --git a/p2p/security/noise/pb/Makefile b/p2p/security/noise/pb/Makefile
@@ -0,0 +1,11 @@
+PB = $(wildcard *.proto)
+GO = $(PB:.proto=.pb.go)
+
+all: $(GO)
+
+%.pb.go: %.proto
+		protoc --proto_path=$(PWD):$(PWD)/../.. --gogofaster_out=. $<
+
+clean:
+		rm -f *.pb.go
+		rm -f *.go