Network fixes (ssvlabs#804)

* revert pre-handshake removal * avoid logs in msg_id func
fplk0 · Jan 11, 2023 · 725b191 · 725b191
1 parent c7714b1
commit 725b191
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/network/peers/connections/handshaker.go b/network/peers/connections/handshaker.go
@@ -173,9 +173,9 @@ func (h *handshaker) Handshake(conn libp2pnetwork.Conn) error {
 	if err != nil || ni != nil {
 		return err
 	}
-	//if err := h.preHandshake(conn); err != nil {
-	//	return errors.Wrap(err, "could not perform pre-handshake")
-	//}
+	if err := h.preHandshake(conn); err != nil {
+		return errors.Wrap(err, "could not perform pre-handshake")
+	}
 	ni, err = h.nodeInfoFromStream(conn)
 	if err != nil {
 		// fallbacks to user agent

diff --git a/network/topics/msg_id.go b/network/topics/msg_id.go
@@ -97,18 +97,19 @@ func (handler *msgIDHandler) MsgID() func(pmsg *ps_pb.Message) string {
 		if pmsg == nil {
 			return MsgIDEmptyMessage
 		}
-		logger := handler.logger.With(zap.ByteString("seq_no", pmsg.GetSeqno()))
+		//logger := handler.logger.With()
 		if len(pmsg.GetData()) == 0 {
 			return MsgIDEmptyMessage
 		}
 		pid, err := peer.IDFromBytes(pmsg.GetFrom())
 		if err != nil {
 			return MsgIDBadPeerID
 		}
-		logger = logger.With(zap.String("from", pid.String()))
 		mid := handler.fork.MsgID()(pmsg.GetData())
 		if len(mid) == 0 {
-			logger.Warn("could not create msg_id")
+			handler.logger.Debug("could not create msg_id",
+				zap.ByteString("seq_no", pmsg.GetSeqno()),
+				zap.String("from", pid.String()))
 			return MsgIDError
 		}
 		handler.Add(mid, pid)