Merge pull request #1676 from keep-network/logging-tweaks

pdyraga · web-flow · commit 5cd74acc681a · 2020-04-24T15:18:13.000+02:00
Logging tweaks for net package
diff --git a/go.mod b/go.mod
@@ -14,7 +14,7 @@ require (
 	github.com/google/gofuzz v1.1.0
 	github.com/ipfs/go-datastore v0.1.1
 	github.com/ipfs/go-log v0.0.1
-	github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200420163504-f5aa53962524
+	github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200423153828-ed815bc50aec
 	github.com/keep-network/keep-common v0.3.0-rc
 	github.com/libp2p/go-addr-util v0.0.1
 	github.com/libp2p/go-libp2p v0.4.1
diff --git a/go.sum b/go.sum
@@ -244,8 +244,8 @@ github.com/karalabe/usb v0.0.0-20191104083709-911d15fe12a9 h1:ZHuwnjpP8LsVsUYqTq
 github.com/karalabe/usb v0.0.0-20191104083709-911d15fe12a9/go.mod h1:Od972xHfMJowv7NGVDiWVxk2zxnWgjLlJzE+F4F7AGU=
 github.com/keep-network/cli v1.20.0 h1:mEufpPsovOVdduTTkk+a2CxS3crIrGFqUsvs58gSik8=
 github.com/keep-network/cli v1.20.0/go.mod h1:nzsst4JjU+rGE8Q5J839fYxectxWHpLhxKNohQWtQhA=
-github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200420163504-f5aa53962524 h1:iOBE6U3YmgJ+VB2DnO5bNH9rmVWSiGUY1xgyjKOEGH8=
-github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200420163504-f5aa53962524/go.mod h1:MtZSKNavpxpPY0VLt2sl118IxptrGQDUb/MBu+j2Yow=
+github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200423153828-ed815bc50aec h1:2pXAsi4OUUjZKr5ds5UOF2IxXN+jVW0WetVO+czkf+A=
+github.com/keep-network/go-libp2p-bootstrap v0.0.0-20200423153828-ed815bc50aec/go.mod h1:xR8jf3/VJAjh3nWu5tFe8Yxnt2HvWsqZHfGef1P5oDk=
 github.com/keep-network/keep-common v0.3.0-rc h1:e2Vdq3TyQ6dGRNZQBykvfYZgKZwNKS+Z8DYEwoMIiuc=
 github.com/keep-network/keep-common v0.3.0-rc/go.mod h1:0uY+hufkP66nFnL+3GXMwWXRiKKsFyXFQTby1xR7AwY=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
@@ -313,7 +313,6 @@ github.com/libp2p/go-libp2p-kad-dht v0.3.0 h1:KUJaqW3kkHP6zcL0s1CDg+yO0NYNNPkXmG
 github.com/libp2p/go-libp2p-kad-dht v0.3.0/go.mod h1:7nBsfkMq2zN1qPs6n/fNopJfvmK9NZRNicRrCnwQR8o=
 github.com/libp2p/go-libp2p-kbucket v0.2.1 h1:q9Jfwww9XnXc1K9dyYuARJxJvIvhgYVaQCuziO/dF3c=
 github.com/libp2p/go-libp2p-kbucket v0.2.1/go.mod h1:/Rtu8tqbJ4WQ2KTCOMJhggMukOLNLNPY1EtEWWLxUvc=
-github.com/libp2p/go-libp2p-loggables v0.0.1/go.mod h1:lDipDlBNYbpyqyPX/KcoO+eq0sJYEVR2JgOexcivchg=
 github.com/libp2p/go-libp2p-loggables v0.1.0 h1:h3w8QFfCt2UJl/0/NW4K829HX/0S4KD31PQ7m8UXXO8=
 github.com/libp2p/go-libp2p-loggables v0.1.0/go.mod h1:EyumB2Y6PrYjr55Q3/tiJ/o3xoDasoRYM7nOzEpoa90=
 github.com/libp2p/go-libp2p-mplex v0.2.0/go.mod h1:Ejl9IyjvXJ0T9iqUTE1jpYATQ9NM3g+OtR+EMMODbKo=
diff --git a/pkg/net/ephemeral/private_key.go b/pkg/net/ephemeral/private_key.go
@@ -29,7 +29,7 @@ func GenerateKeyPair() (*KeyPair, error) {
 	ecdsaKey, err := btcec.NewPrivateKey(curve())
 	if err != nil {
 		return nil, fmt.Errorf(
-			"could not generate new ephemeral keypair [%v]",
+			"could not generate new ephemeral keypair: [%v]",
 			err,
 		)
 	}
@@ -58,7 +58,7 @@ func UnmarshalPrivateKey(bytes []byte) *PrivateKey {
 func UnmarshalPublicKey(bytes []byte) (*PublicKey, error) {
 	pubKey, err := btcec.ParsePubKey(bytes, curve())
 	if err != nil {
-		return nil, fmt.Errorf("could not parse ephemeral public key [%v]", err)
+		return nil, fmt.Errorf("could not parse ephemeral public key: [%v]", err)
 	}
 
 	return (*PublicKey)(pubKey), nil
diff --git a/pkg/net/libp2p/authenticated_connection.go b/pkg/net/libp2p/authenticated_connection.go
@@ -56,7 +56,7 @@ func newAuthenticatedInboundConnection(
 		// close the conn before returning (if it hasn't already)
 		// otherwise we leak.
 		ac.Close()
-		return nil, fmt.Errorf("connection handshake failed [%v]", err)
+		return nil, fmt.Errorf("connection handshake failed: [%v]", err)
 	}
 
 	if err := ac.checkFirewallRules(); err != nil {
@@ -82,7 +82,7 @@ func newAuthenticatedOutboundConnection(
 	remotePublicKey, err := remotePeerID.ExtractPublicKey()
 	if err != nil {
 		return nil, fmt.Errorf(
-			"could not create new authenticated outbound connection [%v]",
+			"could not create new authenticated outbound connection: [%v]",
 			err,
 		)
 	}
@@ -98,7 +98,7 @@ func newAuthenticatedOutboundConnection(
 
 	if err := ac.runHandshakeAsInitiator(); err != nil {
 		ac.Close()
-		return nil, fmt.Errorf("connection handshake failed [%v]", err)
+		return nil, fmt.Errorf("connection handshake failed: [%v]", err)
 	}
 
 	if err := ac.checkFirewallRules(); err != nil {
@@ -425,7 +425,7 @@ func (ac *authenticatedConnection) verify(
 	ok, err := pubKey.Verify(messageBytes, signatureBytes)
 	if err != nil {
 		return fmt.Errorf(
-			"failed to verify signature [0x%v] for sender [%v] with err [%v]",
+			"failed to verify signature [0x%v] for sender [%v]: [%v]",
 			hex.EncodeToString(signatureBytes),
 			actualSender.Pretty(),
 			err,
@@ -434,7 +434,7 @@ func (ac *authenticatedConnection) verify(
 
 	if !ok {
 		return fmt.Errorf(
-			"invalid signature [0x%v] on message from sender [%v] ",
+			"invalid signature [0x%v] on message from sender [%v]",
 			hex.EncodeToString(signatureBytes),
 			actualSender.Pretty(),
 		)
diff --git a/pkg/net/libp2p/channel.go b/pkg/net/libp2p/channel.go
@@ -103,7 +103,7 @@ func (c *channel) Recv(ctx context.Context, handler func(m net.Message)) {
 		for {
 			select {
 			case <-ctx.Done():
-				logger.Debug("context is done, removing handler")
+				logger.Debug("context is done; removing message handler")
 				c.removeHandler(messageHandler)
 				return
 
@@ -210,7 +210,7 @@ func (c *channel) subscriptionWorker(ctx context.Context) {
 			select {
 			case c.incomingMessageQueue <- message:
 			default:
-				logger.Warningf("consumers too slow, dropping message")
+				logger.Warningf("message workers are too slow; dropping message")
 			}
 		}
 	}
@@ -264,7 +264,7 @@ func (c *channel) processContainerMessage(
 	//     sender identifier we grab from the message (inner layer).
 	if proposedSender != senderIdentifier.id {
 		return fmt.Errorf(
-			"Outer layer sender [%v] does not match inner layer sender [%v]",
+			"outer layer sender [%v] does not match inner layer sender [%v]",
 			proposedSender,
 			senderIdentifier,
 		)
@@ -299,7 +299,8 @@ func (c *channel) getUnmarshalingContainerByType(messageType string) (net.Tagged
 	unmarshaler, found := c.unmarshalersByType[messageType]
 	if !found {
 		return nil, fmt.Errorf(
-			"couldn't find unmarshaler for type %s", messageType,
+			"couldn't find unmarshaler for type [%s]",
+			messageType,
 		)
 	}
 
@@ -316,7 +317,7 @@ func (c *channel) deliver(message net.Message) {
 		select {
 		case handler.channel <- message:
 		default:
-			logger.Warningf("handler too slow, dropping message")
+			logger.Warningf("message handler is too slow; dropping message")
 		}
 	}
 }
diff --git a/pkg/net/libp2p/identity.go b/pkg/net/libp2p/identity.go
@@ -27,7 +27,8 @@ func createIdentity(privateKey libp2pcrypto.PrivKey) (*identity, error) {
 	peerID, err := peer.IDFromPublicKey(privateKey.GetPublic())
 	if err != nil {
 		return nil, fmt.Errorf(
-			"could not transform public key to peer's identity [%v]", err,
+			"could not transform public key to peer's identity: [%v]",
+			err,
 		)
 	}
 
@@ -66,15 +67,18 @@ func (i *identity) Unmarshal(bytes []byte) error {
 	)
 
 	if err = pbIdentity.Unmarshal(bytes); err != nil {
-		return fmt.Errorf("unmarshalling failed with error %s", err)
+		return fmt.Errorf("unmarshalling failed: [%v]", err)
 	}
 	i.pubKey, err = libp2pcrypto.UnmarshalPublicKey(pbIdentity.PubKey)
 	if err != nil {
 		return err
 	}
 	pid, err = peer.IDFromPublicKey(i.pubKey)
 	if err != nil {
-		return fmt.Errorf("Failed to generate valid libp2p identity with err: %s", err)
+		return fmt.Errorf(
+			"failed to generate valid libp2p identity: [%v]",
+			err,
+		)
 	}
 	i.id = pid
 
diff --git a/pkg/net/libp2p/libp2p.go b/pkg/net/libp2p/libp2p.go
@@ -53,6 +53,9 @@ const (
 	// FirewallCheckTick is the amount of time between periodic checks of all
 	// firewall rules against all peers connected to this one.
 	FirewallCheckTick = time.Minute * 10
+	// ConnectedPeersCheckTick is the amount of time between periodic checks of
+	// the number of connected peers.
+	ConnectedPeersCheckTick = time.Minute * 1
 )
 
 // Config defines the configuration for the libp2p network provider.
@@ -134,6 +137,14 @@ type connectionManager struct {
 	host.Host
 }
 
+func newConnectionManager(ctx context.Context, host host.Host) *connectionManager {
+	connectionManager := &connectionManager{host}
+
+	go connectionManager.monitorConnectedPeers(ctx)
+
+	return connectionManager
+}
+
 func (cm *connectionManager) ConnectedPeers() []string {
 	var peers []string
 	for _, connectedPeer := range cm.Network().Peers() {
@@ -146,7 +157,7 @@ func (cm *connectionManager) GetPeerPublicKey(connectedPeer string) (*key.Networ
 	peerID, err := peer.IDB58Decode(connectedPeer)
 	if err != nil {
 		return nil, fmt.Errorf(
-			"Failed to decode peer ID from [%s] with error: [%v]",
+			"failed to decode peer ID from [%s]: [%v]",
 			connectedPeer,
 			err,
 		)
@@ -155,7 +166,7 @@ func (cm *connectionManager) GetPeerPublicKey(connectedPeer string) (*key.Networ
 	peerPublicKey, err := peerID.ExtractPublicKey()
 	if err != nil {
 		return nil, fmt.Errorf(
-			"Failed to extract peer [%s] public key with error: [%v]",
+			"failed to extract peer [%s] public key: [%v]",
 			connectedPeer,
 			err,
 		)
@@ -167,7 +178,7 @@ func (cm *connectionManager) GetPeerPublicKey(connectedPeer string) (*key.Networ
 func (cm *connectionManager) DisconnectPeer(peerHash string) {
 	peerID, err := peer.IDB58Decode(peerHash)
 	if err != nil {
-		logger.Errorf("failed to decode peer hash: [%v] [%v]", peerHash, err)
+		logger.Errorf("failed to decode peer hash [%v]: [%v]", peerHash, err)
 		return
 	}
 
@@ -191,6 +202,23 @@ func (cm *connectionManager) AddrStrings() []string {
 	return multiaddrStrings
 }
 
+func (cm *connectionManager) monitorConnectedPeers(ctx context.Context) {
+	ticker := time.NewTicker(ConnectedPeersCheckTick)
+	defer ticker.Stop()
+
+	for {
+		select {
+		case <-ticker.C:
+			connectedPeers := cm.ConnectedPeers()
+
+			logger.Infof("number of connected peers: [%v]", len(connectedPeers))
+			logger.Debugf("connected peers: [%v]", connectedPeers)
+		case <-ctx.Done():
+			return
+		}
+	}
+}
+
 // ConnectOptions allows to set various options used by libp2p.
 type ConnectOptions struct {
 	RoutingTableRefreshPeriod time.Duration
@@ -285,21 +313,21 @@ func Connect(
 	}
 
 	if len(config.Peers) == 0 {
-		logger.Infof("node's peers list is empty")
+		logger.Infof("bootstrap peers list is empty")
 	}
 
-	if err := provider.bootstrap(
-		ctx,
-		config.Peers,
-	); err != nil {
-		return nil, fmt.Errorf("Failed to bootstrap nodes with err: %v", err)
+	if err := provider.bootstrap(ctx, config.Peers); err != nil {
+		return nil, fmt.Errorf("bootstrap failed: [%v]", err)
 	}
 
-	provider.connectionManager = &connectionManager{provider.host}
+	provider.connectionManager = newConnectionManager(ctx, provider.host)
 
-	// Instantiates and starts the connection management background process
+	// Instantiates and starts the connection management background process.
 	watchtower.NewGuard(
-		ctx, FirewallCheckTick, firewall, provider.connectionManager,
+		ctx,
+		FirewallCheckTick,
+		firewall,
+		provider.connectionManager,
 	)
 
 	return provider, nil
@@ -326,7 +354,7 @@ func discoverAndListen(
 	)
 	if err != nil {
 		return nil, fmt.Errorf(
-			"could not create authenticated transport [%v]",
+			"could not create authenticated transport: [%v]",
 			err,
 		)
 	}
diff --git a/pkg/net/libp2p/unicast_channel.go b/pkg/net/libp2p/unicast_channel.go
@@ -295,7 +295,8 @@ func (uc *unicastChannel) getUnmarshalingContainerByType(messageType string) (
 	unmarshaler, found := uc.unmarshalersByType[messageType]
 	if !found {
 		return nil, fmt.Errorf(
-			"couldn't find unmarshaler for type %s", messageType,
+			"couldn't find unmarshaler for type [%s]",
+			messageType,
 		)
 	}
 
diff --git a/pkg/net/libp2p/unicast_channel_manager.go b/pkg/net/libp2p/unicast_channel_manager.go
@@ -92,7 +92,7 @@ func (ucm *unicastChannelManager) getUnicastChannelWithHandshake(
 ) {
 	err := ucm.trialHandshake(peerID)
 	if err != nil {
-		return nil, fmt.Errorf("handshake error: [%v]", err)
+		return nil, fmt.Errorf("unicast channel handshake error: [%v]", err)
 	}
 
 	channel, _, err := ucm.getUnicastChannel(peerID)
diff --git a/pkg/net/retransmission/retransmission.go b/pkg/net/retransmission/retransmission.go
@@ -30,7 +30,7 @@ func ScheduleRetransmissions(
 		ticker.onTick(ctx, func() {
 			go func() {
 				if err := retransmit(); err != nil {
-					logger.Errorf("could not retransmit message [%v]", err)
+					logger.Errorf("could not retransmit message: [%v]", err)
 				}
 			}()
 		})
diff --git a/pkg/net/security/handshake/connection_handshake.go b/pkg/net/security/handshake/connection_handshake.go
@@ -93,7 +93,7 @@ type initiatorAct1 struct {
 func InitiateHandshake() (*initiatorAct1, error) {
 	nonce1, err := randomNonce()
 	if err != nil {
-		return nil, fmt.Errorf("could not initiate the handshake [%v]", err)
+		return nil, fmt.Errorf("could not initiate the handshake: [%v]", err)
 	}
 
 	return &initiatorAct1{nonce1}, nil
@@ -119,7 +119,7 @@ func AnswerHandshake(message *Act1Message) (*responderAct2, error) {
 	nonce1 := message.nonce1
 	nonce2, err := randomNonce()
 	if err != nil {
-		return nil, fmt.Errorf("could not answer the handshake [%v]", err)
+		return nil, fmt.Errorf("could not answer the handshake: [%v]", err)
 	}
 	challenge := hashToChallenge(nonce1, nonce2)
 
@@ -215,7 +215,7 @@ func randomNonce() (uint64, error) {
 	bytes := make([]byte, 8)
 	_, err := crand.Read(bytes)
 	if err != nil {
-		return 0, fmt.Errorf("could not generate a new nonce [%v]", err)
+		return 0, fmt.Errorf("could not generate a new nonce: [%v]", err)
 	}
 
 	return binary.LittleEndian.Uint64(bytes), nil
diff --git a/pkg/net/watchtower/watchtower.go b/pkg/net/watchtower/watchtower.go
@@ -1,4 +1,4 @@
-// Package watchtower continuously monitors firewal rules compliance of all
+// Package watchtower continuously monitors firewall rules compliance of all
 // connected peers, and disconnects peers which do not comply to the rules.
 package watchtower
 
@@ -78,12 +78,9 @@ func (g *Guard) start(ctx context.Context) {
 		case <-ctx.Done():
 			return
 		case <-ticker.C:
+			logger.Debugf("starting firewall guard round")
+
 			connectedPeers := g.connectionManager.ConnectedPeers()
-			logger.Debugf(
-				"connected to [%v] peers: %v\n",
-				len(connectedPeers),
-				connectedPeers,
-			)
 
 			for _, connectedPeer := range connectedPeers {
 				if g.currentlyChecking(connectedPeer) {
@@ -107,7 +104,8 @@ func (g *Guard) checkFirewallRules(peer string) {
 		// if we error while getting the peer's public key, the peer's id
 		// or key may be malformed/unknown; disconnect them immediately.
 		logger.Errorf(
-			"dropping the connection - could not get public key for peer [%v]: [%v]",
+			"dropping the connection; "+
+				"could not get public key for peer [%v]: [%v]",
 			peer,
 			err,
 		)
@@ -118,7 +116,8 @@ func (g *Guard) checkFirewallRules(peer string) {
 	if err := g.firewall.Validate(peerPublicKey); err != nil {
 
 		logger.Warningf(
-			"dropping the connection; firewal rules not satisfied for peer [%v]: [%v] ",
+			"dropping the connection; "+
+				"firewall rules not satisfied for peer [%v]: [%v] ",
 			peer,
 			err,
 		)
@@ -134,7 +133,7 @@ func (g *Guard) getPeerPublicKey(peer string) (*ecdsa.PublicKey, error) {
 
 	if peerPublicKey == nil {
 		return nil, fmt.Errorf(
-			"failed to resolve valid public key for peer %s", peer,
+			"failed to resolve valid public key for peer [%s]", peer,
 		)
 	}
 	return key.NetworkKeyToECDSAKey(peerPublicKey), nil

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func GenerateKeyPair() (*KeyPair, error) {`
`29`	`29`	`ecdsaKey, err := btcec.NewPrivateKey(curve())`
`30`	`30`	`if err != nil {`
`31`	`31`	`return nil, fmt.Errorf(`
`32`		`- "could not generate new ephemeral keypair [%v]",`
	`32`	`+ "could not generate new ephemeral keypair: [%v]",`
`33`	`33`	`err,`
`34`	`34`	`)`
`35`	`35`	`}`
`@@ -58,7 +58,7 @@ func UnmarshalPrivateKey(bytes []byte) *PrivateKey {`
`58`	`58`	`func UnmarshalPublicKey(bytes []byte) (*PublicKey, error) {`
`59`	`59`	`pubKey, err := btcec.ParsePubKey(bytes, curve())`
`60`	`60`	`if err != nil {`
`61`		`- return nil, fmt.Errorf("could not parse ephemeral public key [%v]", err)`
	`61`	`+ return nil, fmt.Errorf("could not parse ephemeral public key: [%v]", err)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`return (*PublicKey)(pubKey), nil`
Original file line number	Diff line number	Diff line change
`@@ -103,7 +103,7 @@ func (c *channel) Recv(ctx context.Context, handler func(m net.Message)) {`
`103`	`103`	`for {`
`104`	`104`	`select {`
`105`	`105`	`case <-ctx.Done():`
`106`		`- logger.Debug("context is done, removing handler")`
	`106`	`+ logger.Debug("context is done; removing message handler")`
`107`	`107`	`c.removeHandler(messageHandler)`
`108`	`108`	`return`
`109`	`109`
`@@ -210,7 +210,7 @@ func (c *channel) subscriptionWorker(ctx context.Context) {`
`210`	`210`	`select {`
`211`	`211`	`case c.incomingMessageQueue <- message:`
`212`	`212`	`default:`
`213`		`- logger.Warningf("consumers too slow, dropping message")`
	`213`	`+ logger.Warningf("message workers are too slow; dropping message")`
`214`	`214`	`}`
`215`	`215`	`}`
`216`	`216`	`}`
`@@ -264,7 +264,7 @@ func (c *channel) processContainerMessage(`
`264`	`264`	`// sender identifier we grab from the message (inner layer).`
`265`	`265`	`if proposedSender != senderIdentifier.id {`
`266`	`266`	`return fmt.Errorf(`
`267`		`- "Outer layer sender [%v] does not match inner layer sender [%v]",`
	`267`	`+ "outer layer sender [%v] does not match inner layer sender [%v]",`
`268`	`268`	`proposedSender,`
`269`	`269`	`senderIdentifier,`
`270`	`270`	`)`
`@@ -299,7 +299,8 @@ func (c *channel) getUnmarshalingContainerByType(messageType string) (net.Tagged`
`299`	`299`	`unmarshaler, found := c.unmarshalersByType[messageType]`
`300`	`300`	`if !found {`
`301`	`301`	`return nil, fmt.Errorf(`
`302`		`- "couldn't find unmarshaler for type %s", messageType,`
	`302`	`+ "couldn't find unmarshaler for type [%s]",`
	`303`	`+ messageType,`
`303`	`304`	`)`
`304`	`305`	`}`
`305`	`306`
`@@ -316,7 +317,7 @@ func (c *channel) deliver(message net.Message) {`
`316`	`317`	`select {`
`317`	`318`	`case handler.channel <- message:`
`318`	`319`	`default:`
`319`		`- logger.Warningf("handler too slow, dropping message")`
	`320`	`+ logger.Warningf("message handler is too slow; dropping message")`
`320`	`321`	`}`
`321`	`322`	`}`
`322`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ func createIdentity(privateKey libp2pcrypto.PrivKey) (*identity, error) {`
`27`	`27`	`peerID, err := peer.IDFromPublicKey(privateKey.GetPublic())`
`28`	`28`	`if err != nil {`
`29`	`29`	`return nil, fmt.Errorf(`
`30`		`- "could not transform public key to peer's identity [%v]", err,`
	`30`	`+ "could not transform public key to peer's identity: [%v]",`
	`31`	`+ err,`
`31`	`32`	`)`
`32`	`33`	`}`
`33`	`34`
`@@ -66,15 +67,18 @@ func (i *identity) Unmarshal(bytes []byte) error {`
`66`	`67`	`)`
`67`	`68`
`68`	`69`	`if err = pbIdentity.Unmarshal(bytes); err != nil {`
`69`		`- return fmt.Errorf("unmarshalling failed with error %s", err)`
	`70`	`+ return fmt.Errorf("unmarshalling failed: [%v]", err)`
`70`	`71`	`}`
`71`	`72`	`i.pubKey, err = libp2pcrypto.UnmarshalPublicKey(pbIdentity.PubKey)`
`72`	`73`	`if err != nil {`
`73`	`74`	`return err`
`74`	`75`	`}`
`75`	`76`	`pid, err = peer.IDFromPublicKey(i.pubKey)`
`76`	`77`	`if err != nil {`
`77`		`- return fmt.Errorf("Failed to generate valid libp2p identity with err: %s", err)`
	`78`	`+ return fmt.Errorf(`
	`79`	`+ "failed to generate valid libp2p identity: [%v]",`
	`80`	`+ err,`
	`81`	`+ )`
`78`	`82`	`}`
`79`	`83`	`i.id = pid`
`80`	`84`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,8 @@ func (uc *unicastChannel) getUnmarshalingContainerByType(messageType string) (`
`295`	`295`	`unmarshaler, found := uc.unmarshalersByType[messageType]`
`296`	`296`	`if !found {`
`297`	`297`	`return nil, fmt.Errorf(`
`298`		`- "couldn't find unmarshaler for type %s", messageType,`
	`298`	`+ "couldn't find unmarshaler for type [%s]",`
	`299`	`+ messageType,`
`299`	`300`	`)`
`300`	`301`	`}`
`301`	`302`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (ucm *unicastChannelManager) getUnicastChannelWithHandshake(`
`92`	`92`	`) {`
`93`	`93`	`err := ucm.trialHandshake(peerID)`
`94`	`94`	`if err != nil {`
`95`		`- return nil, fmt.Errorf("handshake error: [%v]", err)`
	`95`	`+ return nil, fmt.Errorf("unicast channel handshake error: [%v]", err)`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`channel, _, err := ucm.getUnicastChannel(peerID)`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ func ScheduleRetransmissions(`
`30`	`30`	`ticker.onTick(ctx, func() {`
`31`	`31`	`go func() {`
`32`	`32`	`if err := retransmit(); err != nil {`
`33`		`- logger.Errorf("could not retransmit message [%v]", err)`
	`33`	`+ logger.Errorf("could not retransmit message: [%v]", err)`
`34`	`34`	`}`
`35`	`35`	`}()`
`36`	`36`	`})`