forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-27 23:26:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

swarm/network: removed debug lines

Browse source
This commit is contained in:
nolash 2017-06-15 18:20:06 +02:00 committed by Lewis Marshall
parent 1b6f480eba
commit 1598e68600
1 changed files with 18 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
swarm/network/protocol.go
View file

@ -23,7 +23,6 @@ import (
"net" "net"
"sync" "sync"
"time" "time"
"strings"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/log" "github.com/ethereum/go-ethereum/log"
@ -292,21 +291,24 @@ func (self *bzzHandshake) Perform(p *p2p.Peer, rw p2p.MsgReadWriter) (err error)
return fmt.Errorf("version mismatch %d (!= %d)", rhs.Version, self.Version) return fmt.Errorf("version mismatch %d (!= %d)", rhs.Version, self.Version)
} }
self.peerAddr = rhs.Addr self.peerAddr = rhs.Addr
peerid := p.ID() //log.Debug("L&R handshake", "local", fmt.Sprintf("%x", self.Addr.Over()), "remote", fmt.Sprintf("%x", rhs.Addr.Over()))
log.Warn( // log.Debug("RHS handshake", "addr", rhs.Addr, "peeraddr", rhs.peerAddr)
strings.Join( // log.Debug("LHS handshake", "addr", self.Addr, "peeraddr", self.peerAddr)
[]string{ //
"handshake ok:", // log.Warn(
fmt.Sprintf("p2p.Peer.ID(): ...... %v", p.ID()), // strings.Join(
fmt.Sprintf("peerAddr.UAddr: ...... %x", self.peerAddr.UAddr[:32]), // []string{
fmt.Sprintf("peerAddr.OAddr: ...... %x", self.peerAddr.OAddr[:32]), // "handshake ok:",
fmt.Sprintf("selfAddr.UAddr: ...... %x", self.Addr.UAddr[:32]), // fmt.Sprintf("p2p.Peer.ID(): ...... %v", p.ID()),
fmt.Sprintf("selfAddr.OAddr: ...... %x", self.Addr.OAddr[:32]), // fmt.Sprintf("peerAddr.UAddr: ...... %x", self.peerAddr.UAddr[:32]),
fmt.Sprintf("ToOverlayAddr(p2p.Peer.ID): .... %x", ToOverlayAddr(peerid[:])), // fmt.Sprintf("peerAddr.OAddr: ...... %x", self.peerAddr.OAddr[:32]),
fmt.Sprintf("ToOverlayAddr(peerAddr.UAddr): .. %x", ToOverlayAddr(self.peerAddr.UAddr)), // fmt.Sprintf("selfAddr.UAddr: ...... %x", self.Addr.UAddr[:32]),
}, "\n", // fmt.Sprintf("selfAddr.OAddr: ...... %x", self.Addr.OAddr[:32]),
), // fmt.Sprintf("ToOverlayAddr(p2p.Peer.ID): .... %x", ToOverlayAddr(peerid[:])),
) // fmt.Sprintf("ToOverlayAddr(peerAddr.UAddr): .. %x", ToOverlayAddr(self.peerAddr.UAddr)),
// }, "\n",
// ),
// )
return nil return nil
} }