chore(dot/peerset): Remove log15 usage (ChainSafe#2025)

dot/peerset/peerset.go

@@ -3,14 +3,15 @@ package peerset
 import (
 	"fmt"
 	"math"
+	"strings"
 	"time"
 
-	log "github.com/ChainSafe/log15"
+	"github.com/ChainSafe/gossamer/internal/log"
 	"github.com/libp2p/go-libp2p-core/peer"
 )
 
 var (
-	logger = log.New("pkg", "peerset")
+	logger = log.NewFromGlobal(log.AddContext("pkg", "peerset"))
 )
 
 const (
@@ -57,6 +58,15 @@ type action struct {
 	resultPeersCh chan peer.IDSlice
 }
 
+func (a action) String() string {
+	peersStrings := make([]string, len(a.peers))
+	for i := range a.peers {
+		peersStrings[i] = a.peers[i].String()
+	}
+	return fmt.Sprintf("{call=%d, set-id=%d, reputation change %v, peers=[%s]",
+		a.actionCall, a.setID, a.reputation, strings.Join(peersStrings, ", "))
+}
+
 // Status represents the enum value for Message
 type Status uint8
 
@@ -361,7 +371,7 @@ func (ps *PeerSet) allocSlots(setIdx int) error {
 
 		n := peerState.nodes[peerID]
 		if n.getReputation() < BannedThresholdValue {
-			logger.Crit("highest rated peer is below bannedThresholdValue")
+			logger.Critical("highest rated peer is below bannedThresholdValue")
 			break
 		}
 
@@ -375,15 +385,15 @@ func (ps *PeerSet) allocSlots(setIdx int) error {
 			PeerID: peerID,
 		}
 
-		logger.Debug("Sent connect message", "peer", peerID)
+		logger.Debugf("Sent connect message to peer %s", peerID)
 	}
 	return nil
 }
 
 func (ps *PeerSet) addReservedPeers(setID int, peers ...peer.ID) error {
 	for _, peerID := range peers {
 		if _, ok := ps.reservedNode[peerID]; ok {
-			logger.Debug("peer already exists in peerSet", "peer", peerID)
+			logger.Debugf("peer %s already exists in peerSet", peerID)
 			return nil
 		}
 
@@ -399,7 +409,7 @@ func (ps *PeerSet) addReservedPeers(setID int, peers ...peer.ID) error {
 func (ps *PeerSet) removeReservedPeers(setID int, peers ...peer.ID) error {
 	for _, peerID := range peers {
 		if _, ok := ps.reservedNode[peerID]; !ok {
-			logger.Debug("peer doesn't exists in the peerSet", "peerID", peerID)
+			logger.Debugf("peer %s doesn't exist in the peerSet", peerID)
 			return nil
 		}
 
@@ -473,7 +483,7 @@ func (ps *PeerSet) addPeer(setID int, peers peer.IDSlice) error {
 func (ps *PeerSet) removePeer(setID int, peers ...peer.ID) error {
 	for _, pid := range peers {
 		if _, ok := ps.reservedNode[pid]; ok {
-			logger.Debug("peer is reserved and cannot be removed", "peer", pid)
+			logger.Debugf("peer %s is reserved and cannot be removed", pid)
 			return nil
 		}
 
@@ -610,7 +620,7 @@ func (ps *PeerSet) doWork() {
 			l := ps.peerState.getSetLength()
 			for i := 0; i < l; i++ {
 				if err := ps.allocSlots(i); err != nil {
-					logger.Debug("failed to do action on peerSet ", "error", err)
+					logger.Debugf("failed to do action on peerSet: %s", err)
 				}
 			}
 		case act, ok := <-ps.actionQueue:
@@ -645,7 +655,7 @@ func (ps *PeerSet) doWork() {
 			}
 
 			if err != nil {
-				logger.Error("failed to do action on peerSet", "action", act, "error", err)
+				logger.Errorf("failed to do action %s on peerSet: %s", act, err)
 			}
 		}
 	}

dot/peerset/peerstate.go

@@ -235,7 +235,7 @@ func (ps *PeersState) hasFreeIncomingSlot(set int) bool {
 // has no effect if the node was already in the group.
 func (ps *PeersState) addNoSlotNode(idx int, peerID peer.ID) {
 	if _, ok := ps.sets[idx].noSlotNodes[peerID]; ok {
-		logger.Debug("peer is already exists in no slot node", "peer", peerID)
+		logger.Debugf("peer %s already exists in no slot node", peerID)
 		return
 	}
 

go.mod

@@ -3,7 +3,6 @@ module github.com/ChainSafe/gossamer
 require (
 	github.com/ChainSafe/chaindb v0.1.5-0.20210608140454-9606fe8c3985
 	github.com/ChainSafe/go-schnorrkel v0.0.0-20210318173838-ccb5cd955283
-	github.com/ChainSafe/log15 v1.0.0
 	github.com/OneOfOne/xxhash v1.2.8
 	github.com/btcsuite/btcutil v1.0.3-0.20201208143702-a53e38424cce
 	github.com/centrifuge/go-substrate-rpc-client/v3 v3.0.0
@@ -46,6 +45,7 @@ require (
 )
 
 require (
+	github.com/ChainSafe/log15 v1.0.0 // indirect
 	github.com/StackExchange/wmi v0.0.0-20180116203802-5d049714c4a6 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/btcsuite/btcd v0.22.0-beta // indirect