satisfy race detector

This commit is contained in:
nisdas 2020-09-10 17:19:19 +08:00 committed by vyzo
parent b0d384d2e8
commit f7f33e10cc
1 changed files with 25 additions and 12 deletions

View File

@ -1584,12 +1584,21 @@ func TestGossipsubMultipleGraftTopics(t *testing.T) {
firstPeer := hosts[0].ID() firstPeer := hosts[0].ID()
secondPeer := hosts[1].ID() secondPeer := hosts[1].ID()
p2Sub := psubs[1]
p1Router := psubs[0].rt.(*GossipSubRouter) p1Router := psubs[0].rt.(*GossipSubRouter)
p2Router := psubs[1].rt.(*GossipSubRouter) p2Router := psubs[1].rt.(*GossipSubRouter)
// Add topics to second peer
p2Router.mesh[firstTopic] = map[peer.ID]struct{}{} finChan := make(chan struct{})
p2Router.mesh[secondTopic] = map[peer.ID]struct{}{}
p2Router.mesh[thirdTopic] = map[peer.ID]struct{}{} p2Sub.eval <- func() {
// Add topics to second peer
p2Router.mesh[firstTopic] = map[peer.ID]struct{}{}
p2Router.mesh[secondTopic] = map[peer.ID]struct{}{}
p2Router.mesh[thirdTopic] = map[peer.ID]struct{}{}
finChan <- struct{}{}
}
<-finChan
// Send multiple GRAFT messages to second peer from // Send multiple GRAFT messages to second peer from
// 1st peer // 1st peer
@ -1599,15 +1608,19 @@ func TestGossipsubMultipleGraftTopics(t *testing.T) {
time.Sleep(time.Second * 1) time.Sleep(time.Second * 1)
if _, ok := p2Router.mesh[firstTopic][firstPeer]; !ok { p2Sub.eval <- func() {
t.Errorf("First peer wasnt added to mesh of the second peer for the topic %s", firstTopic) if _, ok := p2Router.mesh[firstTopic][firstPeer]; !ok {
} t.Errorf("First peer wasnt added to mesh of the second peer for the topic %s", firstTopic)
if _, ok := p2Router.mesh[secondTopic][firstPeer]; !ok { }
t.Errorf("First peer wasnt added to mesh of the second peer for the topic %s", secondTopic) if _, ok := p2Router.mesh[secondTopic][firstPeer]; !ok {
} t.Errorf("First peer wasnt added to mesh of the second peer for the topic %s", secondTopic)
if _, ok := p2Router.mesh[thirdTopic][firstPeer]; !ok { }
t.Errorf("First peer wasnt added to mesh of the second peer for the topic %s", thirdTopic) if _, ok := p2Router.mesh[thirdTopic][firstPeer]; !ok {
t.Errorf("First peer wasnt added to mesh of the second peer for the topic %s", thirdTopic)
}
finChan <- struct{}{}
} }
<-finChan
} }
func TestGossipsubOpportunisticGrafting(t *testing.T) { func TestGossipsubOpportunisticGrafting(t *testing.T) {