From ce4e77f0447f5d20b5d62dbb0ce4ed765a6cccaa Mon Sep 17 00:00:00 2001
From: xenowits <kumar.abhishek111b@gmail.com>
Date: Thu, 2 Jun 2022 16:12:44 +0530
Subject: [PATCH] use log.WithCtx..

---
 core/consensus/component.go  | 2 +-
 core/consensus/transport.go  | 2 --
 core/leadercast/transport.go | 2 +-
 core/parsigex/parsigex.go    | 2 +-
 dkg/frostp2p.go              | 4 ++--
 dkg/transport.go             | 2 +-
 p2p/peer.go                  | 2 --
 7 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/consensus/component.go b/core/consensus/component.go
index 6e72dd56a..587a1bf5e 100644
--- a/core/consensus/component.go
+++ b/core/consensus/component.go
@@ -181,7 +181,7 @@ func (c *Component) Propose(ctx context.Context, duty core.Duty, data core.Unsig
 func (c *Component) makeHandler(ctx context.Context) func(s network.Stream) {
 	ctx = log.WithTopic(ctx, "qbft")
 	return func(s network.Stream) {
-		ctx = context.WithValue(ctx, p2p.PeerCtxKey, p2p.PeerName(s.Conn().RemotePeer()))
+		ctx = log.WithCtx(ctx, z.Str("peer", p2p.PeerName(s.Conn().RemotePeer())))
 		defer s.Close()
 
 		b, err := io.ReadAll(s)
diff --git a/core/consensus/transport.go b/core/consensus/transport.go
index a78be5e99..9f06ee5d1 100644
--- a/core/consensus/transport.go
+++ b/core/consensus/transport.go
@@ -30,7 +30,6 @@ import (
 	"github.com/obolnetwork/charon/core"
 	pbv1 "github.com/obolnetwork/charon/core/corepb/v1"
 	"github.com/obolnetwork/charon/core/qbft"
-	"github.com/obolnetwork/charon/p2p"
 )
 
 // transport encapsulates receiving and broadcasting for a consensus instance/duty.
@@ -116,7 +115,6 @@ func (t *transport) Broadcast(ctx context.Context, typ qbft.MsgType, duty core.D
 			continue
 		}
 
-		ctx = context.WithValue(ctx, p2p.PeerCtxKey, p2p.PeerName(t.component.tcpNode.ID()))
 		err := send(ctx, t.component.tcpNode, p.ID, msg.ToConsensusMsg())
 		if err != nil {
 			log.Warn(ctx, "Failed sending message", err)
diff --git a/core/leadercast/transport.go b/core/leadercast/transport.go
index bd2fd426d..563fe89fb 100644
--- a/core/leadercast/transport.go
+++ b/core/leadercast/transport.go
@@ -64,7 +64,7 @@ type p2pTransport struct {
 // handle implements p2p network.StreamHandler processing new incoming messages.
 func (t *p2pTransport) handle(s network.Stream) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
-	ctx = context.WithValue(ctx, p2p.PeerCtxKey, p2p.PeerName(s.Conn().RemotePeer()))
+	ctx = log.WithCtx(ctx, z.Str("peer", p2p.PeerName(s.Conn().RemotePeer())))
 
 	defer cancel()
 	defer s.Close()
diff --git a/core/parsigex/parsigex.go b/core/parsigex/parsigex.go
index b617656eb..f1703da77 100644
--- a/core/parsigex/parsigex.go
+++ b/core/parsigex/parsigex.go
@@ -59,7 +59,7 @@ type ParSigEx struct {
 func (m *ParSigEx) handle(s network.Stream) {
 	ctx, cancel := context.WithTimeout(context.Background(), time.Second)
 	ctx = log.WithTopic(ctx, "parsigex")
-	ctx = context.WithValue(ctx, p2p.PeerCtxKey, p2p.PeerName(s.Conn().RemotePeer()))
+	ctx = log.WithCtx(ctx, z.Str("peer", p2p.PeerName(s.Conn().RemotePeer())))
 	defer cancel()
 	defer s.Close()
 
diff --git a/dkg/frostp2p.go b/dkg/frostp2p.go
index b33c6ab51..bcd8739f2 100644
--- a/dkg/frostp2p.go
+++ b/dkg/frostp2p.go
@@ -51,7 +51,7 @@ func newFrostP2P(ctx context.Context, tcpNode host.Host, peers map[uint32]peer.I
 	}
 
 	tcpNode.SetStreamHandler(round1Protocol(clusterID), func(s network.Stream) {
-		ctx = context.WithValue(ctx, p2p.PeerCtxKey, p2p.PeerName(s.Conn().RemotePeer()))
+		ctx = log.WithCtx(ctx, z.Str("peer", p2p.PeerName(s.Conn().RemotePeer())))
 		defer s.Close()
 
 		b, err := io.ReadAll(s)
@@ -79,7 +79,7 @@ func newFrostP2P(ctx context.Context, tcpNode host.Host, peers map[uint32]peer.I
 	})
 
 	tcpNode.SetStreamHandler(round2Protocol(clusterID), func(s network.Stream) {
-		ctx = context.WithValue(ctx, p2p.PeerCtxKey, p2p.PeerName(s.Conn().RemotePeer()))
+		ctx = log.WithCtx(ctx, z.Str("peer", p2p.PeerName(s.Conn().RemotePeer())))
 		defer s.Close()
 
 		b, err := io.ReadAll(s)
diff --git a/dkg/transport.go b/dkg/transport.go
index 60a7b2a11..9a9dc8e9e 100644
--- a/dkg/transport.go
+++ b/dkg/transport.go
@@ -41,7 +41,7 @@ type keycastP2P struct {
 // ServeShares serves the dealer shares to other nodes on request. It returns when the context is closed.
 func (t keycastP2P) ServeShares(ctx context.Context, handler func(nodeIdx int) (msg []byte, err error)) {
 	t.tcpNode.SetStreamHandler(getProtocol(t.clusterID), func(s network.Stream) {
-		ctx = context.WithValue(ctx, p2p.PeerCtxKey, p2p.PeerName(s.Conn().RemotePeer()))
+		ctx = log.WithCtx(ctx, z.Str("peer", p2p.PeerName(s.Conn().RemotePeer())))
 		defer s.Close()
 
 		var (
diff --git a/p2p/peer.go b/p2p/peer.go
index 786330a20..cf2093d0c 100644
--- a/p2p/peer.go
+++ b/p2p/peer.go
@@ -27,8 +27,6 @@ import (
 	"github.com/obolnetwork/charon/app/errors"
 )
 
-const PeerCtxKey = "peer"
-
 // Peer represents a peer in the libp2p network, either a charon node or a relay.
 type Peer struct {
 	// ENR defines the networking information of the peer.