diff options
| author | Viktor Trón <viktor.tron@gmail.com> | 2019-01-10 10:36:19 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-10 10:36:19 +0800 |
| commit | 6df3e4eeb0dda986aef3f71335151fa63c06f6d3 (patch) | |
| tree | befe88b3e0d044281037cd4fcaaab09d32338d6a /swarm/network/stream | |
| parent | d70c4faf20d5533e30eec5cbb9b5180eb837b78c (diff) | |
| download | dexon-6df3e4eeb0dda986aef3f71335151fa63c06f6d3.tar dexon-6df3e4eeb0dda986aef3f71335151fa63c06f6d3.tar.gz dexon-6df3e4eeb0dda986aef3f71335151fa63c06f6d3.tar.bz2 dexon-6df3e4eeb0dda986aef3f71335151fa63c06f6d3.tar.lz dexon-6df3e4eeb0dda986aef3f71335151fa63c06f6d3.tar.xz dexon-6df3e4eeb0dda986aef3f71335151fa63c06f6d3.tar.zst dexon-6df3e4eeb0dda986aef3f71335151fa63c06f6d3.zip | |
swarm/network: remove isproxbin bool from kad.Each* iterfunc (#18239)
* swarm/network, swarm/pss: remove isproxbin bool from kad.Each* iterfunc
* swarm/network: restore comment and unskip snapshot sync tests
Diffstat (limited to 'swarm/network/stream')
| -rw-r--r-- | swarm/network/stream/delivery.go | 3 | ||||
| -rw-r--r-- | swarm/network/stream/messages.go | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/swarm/network/stream/delivery.go b/swarm/network/stream/delivery.go index c73298d9a..e1a13fe8d 100644 --- a/swarm/network/stream/delivery.go +++ b/swarm/network/stream/delivery.go @@ -19,7 +19,6 @@ package stream import ( "context" "errors" - "fmt" "github.com/ethereum/go-ethereum/metrics" @@ -245,7 +244,7 @@ func (d *Delivery) RequestFromPeers(ctx context.Context, req *network.Request) ( return nil, nil, fmt.Errorf("source peer %v not found", spID.String()) } } else { - d.kad.EachConn(req.Addr[:], 255, func(p *network.Peer, po int, nn bool) bool { + d.kad.EachConn(req.Addr[:], 255, func(p *network.Peer, po int) bool { id := p.ID() if p.LightNode { // skip light nodes diff --git a/swarm/network/stream/messages.go b/swarm/network/stream/messages.go index eb1b2983e..b293724cc 100644 --- a/swarm/network/stream/messages.go +++ b/swarm/network/stream/messages.go @@ -336,7 +336,7 @@ func (p *Peer) handleWantedHashesMsg(ctx context.Context, req *WantedHashesMsg) // launch in go routine since GetBatch blocks until new hashes arrive go func() { if err := p.SendOfferedHashes(s, req.From, req.To); err != nil { - log.Warn("SendOfferedHashes error", "err", err) + log.Warn("SendOfferedHashes error", "peer", p.ID().TerminalString(), "err", err) } }() // go p.SendOfferedHashes(s, req.From, req.To) |