forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

revert Send to SendPriority

Browse source
This commit is contained in:
Anton Evangelatov 2019-03-14 15:55:20 +01:00
parent fc8ff6d993
commit a22e56974f
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
swarm/network/stream/delivery.go
View file

@ -295,13 +295,12 @@ func (d *Delivery) RequestFromPeers(ctx context.Context, req *network.Request) (
// this span will finish only when delivery is handled (or times out) // this span will finish only when delivery is handled (or times out)
ctx = context.WithValue(ctx, tracing.StoreLabelId, "stream.send.request") ctx = context.WithValue(ctx, tracing.StoreLabelId, "stream.send.request")
ctx = context.WithValue(ctx, tracing.StoreLabelMeta, fmt.Sprintf("%v.%v", sp.ID(), req.Addr)) ctx = context.WithValue(ctx, tracing.StoreLabelMeta, fmt.Sprintf("%v.%v", sp.ID(), req.Addr))
ctx = tracing.StartSaveSpan(ctx)
log.Trace("request.from.peers", "peer", sp.ID(), "ref", req.Addr) log.Trace("request.from.peers", "peer", sp.ID(), "ref", req.Addr)
err := sp.Send(ctx, &RetrieveRequestMsg{ err := sp.SendPriority(ctx, &RetrieveRequestMsg{
Addr: req.Addr, Addr: req.Addr,
SkipCheck: req.SkipCheck, SkipCheck: req.SkipCheck,
HopCount: req.HopCount, HopCount: req.HopCount,
}) }, Top)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
} }

2
swarm/network/stream/peer.go
View file

@ -154,7 +154,7 @@ func (p *Peer) Deliver(ctx context.Context, chunk storage.Chunk, priority uint8,
} }
ctx = context.WithValue(ctx, "stream_send_tag", nil) ctx = context.WithValue(ctx, "stream_send_tag", nil)
return p.Send(ctx, msg) return p.SendPriority(ctx, msg, priority)
} }
// SendPriority sends message to the peer using the outgoing priority queue // SendPriority sends message to the peer using the outgoing priority queue