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

swarm/network/stream: fixed timing issues

Browse source
This commit is contained in:
Fabio Barone 2019-03-06 10:46:10 -05:00
parent 81ed700157
commit eb86e581c6
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
swarm/network/stream/streamer_test.go
View file

@ -1189,7 +1189,7 @@ func TestGetSubscriptionsRPC(t *testing.T) {
// arbitrarily set to 4 // arbitrarily set to 4
nodeCount := 4 nodeCount := 4
// set the syncUpdateDelay for sync registrations to start // set the syncUpdateDelay for sync registrations to start
syncUpdateDelay := 200 * time.Millisecond syncUpdateDelay := 800 * time.Millisecond
// run with more nodes if `longrunning` flag is set // run with more nodes if `longrunning` flag is set
if *longrunning { if *longrunning {
nodeCount = 64 nodeCount = 64
@ -1245,19 +1245,19 @@ func TestGetSubscriptionsRPC(t *testing.T) {
ctx, cancelSimRun := context.WithTimeout(context.Background(), 3*time.Minute) ctx, cancelSimRun := context.WithTimeout(context.Background(), 3*time.Minute)
defer cancelSimRun() defer cancelSimRun()
// setup the filter for SubscribeMsg
msgs := sim.PeerEvents(
context.Background(),
sim.UpNodeIDs(),
simulation.NewPeerEventsFilter().ReceivedMessages().Protocol("stream").MsgCode(subscribeMsgCode),
)
// upload a snapshot // upload a snapshot
err := sim.UploadSnapshot(fmt.Sprintf("testing/snapshot_%d.json", nodeCount)) err := sim.UploadSnapshot(fmt.Sprintf("testing/snapshot_%d.json", nodeCount))
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
// setup the filter for SubscribeMsg
msgs := sim.PeerEvents(
context.Background(),
sim.NodeIDs(),
simulation.NewPeerEventsFilter().ReceivedMessages().Protocol("stream").MsgCode(subscribeMsgCode),
)
// strategy: listen to all SubscribeMsg events; after every event we wait // strategy: listen to all SubscribeMsg events; after every event we wait
// if after `waitDuration` no more messages are being received, we assume the // if after `waitDuration` no more messages are being received, we assume the
// subscription phase has terminated! // subscription phase has terminated!
@ -1267,9 +1267,9 @@ func TestGetSubscriptionsRPC(t *testing.T) {
// any new subscriptions any more // any new subscriptions any more
go func() { go func() {
//for long running sims, waiting 1 sec will not be enough //for long running sims, waiting 1 sec will not be enough
waitDuration := time.Duration(nodeCount/16) * time.Second waitDuration := 1 * time.Second
if *longrunning { if *longrunning {
waitDuration = syncUpdateDelay waitDuration = 3 * time.Second
} }
for { for {
select { select {
@ -1335,8 +1335,10 @@ func TestGetSubscriptionsRPC(t *testing.T) {
log.Debug("All node streams counted", "realCount", realCount) log.Debug("All node streams counted", "realCount", realCount)
} }
emc := expectedMsgCount.count() emc := expectedMsgCount.count()
if realCount != emc { // after a subscription request, internally a live AND a history stream will be subscirbed,
return fmt.Errorf("Real subscriptions and expected amount don't match; real: %d, expected: %d", realCount, emc) // thus the real count should be half of the actual request subscriptions sent
if realCount/2 != emc {
return fmt.Errorf("Real subscriptions and expected amount don't match; real: %d, expected: %d", realCount/2, emc)
} }
return nil return nil
}) })