forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-18 09:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

swarm/network/stream: add missing WaitGroup.Add and fix errc send blocking

Browse source
This commit is contained in:
Janos Guljas 2018-04-12 11:12:05 +02:00
parent 2605f59bc0
commit b3be75c537
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
swarm/network/stream/snapshot_sync_test.go
View file

@ -300,6 +300,7 @@ func runSyncTest(chunkCount int, nodeCount int, live bool, history bool) error {
if wsDoneC == nil { if wsDoneC == nil {
continue continue
} }
rpcSubscriptionsWg.Add(1)
go func() { go func() {
<-wsDoneC <-wsDoneC
rpcSubscriptionsWg.Done() rpcSubscriptionsWg.Done()
@ -628,7 +629,10 @@ func watchSubscriptionEvents(ctx context.Context, id discover.NodeID, client *rp
case <-quitC: case <-quitC:
return return
case <-ctx.Done(): case <-ctx.Done():
errc <- ctx.Err() select {
case errc <- ctx.Err():
case <-quitC:
}
return return
case e := <-events: case e := <-events:
//just catch SubscribeMsg //just catch SubscribeMsg
@ -637,7 +641,10 @@ func watchSubscriptionEvents(ctx context.Context, id discover.NodeID, client *rp
} }
case err := <-sub.Err(): case err := <-sub.Err():
if err != nil { if err != nil {
errc <- fmt.Errorf("error getting peer events for node %v: %v", id, err) select {
case errc <- fmt.Errorf("error getting peer events for node %v: %v", id, err):
case <-quitC:
}
return return
} }
} }