cerc-io/go-ethereum
18
0
Fork 0
Code Issues 9 Pull Requests Packages Projects Releases 66 Wiki Activity

Patch for concurrent iterator & others (onto v1.11.6) #386

Closed
roysc wants to merge 1565 commits from v1.11.6-statediff-v5 into master
pull from: v1.11.6-statediff-v5
merge into: cerc-io:master
Conversation 0 Commits 1565 Files Changed 1471 +2
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 656dc8cc00 - Show all commits

1
eth/downloader/peer.go
View File

@ -237,6 +237,7 @@ func (ps *peerSet) Register(p *peerConnection) error {
} }
p.rates = msgrate.NewTracker(ps.rates.MeanCapacities(), ps.rates.MedianRoundTrip()) p.rates = msgrate.NewTracker(ps.rates.MeanCapacities(), ps.rates.MedianRoundTrip())
if err := ps.rates.Track(p.id, p.rates); err != nil { if err := ps.rates.Track(p.id, p.rates); err != nil {
ps.lock.Unlock()
return err return err
} }
ps.peers[p.id] = p ps.peers[p.id] = p

1
les/downloader/peer.go
View File

@ -350,6 +350,7 @@ func (ps *peerSet) Register(p *peerConnection) error {
} }
p.rates = msgrate.NewTracker(ps.rates.MeanCapacities(), ps.rates.MedianRoundTrip()) p.rates = msgrate.NewTracker(ps.rates.MeanCapacities(), ps.rates.MedianRoundTrip())
if err := ps.rates.Track(p.id, p.rates); err != nil { if err := ps.rates.Track(p.id, p.rates); err != nil {
ps.lock.Unlock()
return err return err
} }
ps.peers[p.id] = p ps.peers[p.id] = p