status-im
/
go-waku
mirror of https://github.com/status-im/go-waku.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: flaky test (#211)

This commit is contained in:
Richard Ramos 2022-03-18 15:50:10 -04:00 committed by GitHub
parent e7098efcff
commit af6f36ec54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
waku/v2/discv5/discover.go
View File

@ -285,6 +285,7 @@ func (d *DiscoveryV5) UpdateAddr(addr net.IP) error {
return nil
}
/*
func isWakuNode(node *enode.Node) bool {
enrField := new(utils.WakuEnrBitfield)
if err := node.Record().Load(enr.WithEntry(utils.WakuENRField, &enrField)); err != nil {
@ -300,6 +301,7 @@ func isWakuNode(node *enode.Node) bool {
return false
}
*/
func hasTCPPort(node *enode.Node) bool {
enrTCP := new(enr.TCP)

39
waku/v2/node/wakunode2_test.go
View File

@ -1,8 +1,9 @@
package node
import (
"bytes"
"context"
"fmt"
"math/big"
"net"
"sync"
"testing"
@ -36,7 +37,17 @@ func TestWakuNode2(t *testing.T) {
require.NoError(t, err)
}
func Test1100(t *testing.T) {
func int2Bytes(i int) []byte {
if i > 0 {
return append(big.NewInt(int64(i)).Bytes(), byte(1))
}
return append(big.NewInt(int64(i)).Bytes(), byte(0))
}
func Test5000(t *testing.T) {
maxMsgs := 5000
maxMsgBytes := int2Bytes(maxMsgs)
ctx, cancel := context.WithTimeout(context.Background(), 20*time.Second)
defer cancel()
@ -86,16 +97,12 @@ func Test1100(t *testing.T) {
ticker := time.NewTimer(20 * time.Second)
defer ticker.Stop()
msgCnt := 0
for {
select {
case <-ticker.C:
if msgCnt != 1100 {
require.Fail(t, "Timeout Sub1")
}
case <-sub1.C:
msgCnt++
if msgCnt == 1100 {
require.Fail(t, "Timeout Sub1")
case msg := <-sub1.C:
if bytes.Equal(msg.Message().Payload, maxMsgBytes) {
return
}
}
@ -108,16 +115,12 @@ func Test1100(t *testing.T) {
ticker := time.NewTimer(20 * time.Second)
defer ticker.Stop()
msgCnt := 0
for {
select {
case <-ticker.C:
if msgCnt != 1100 {
require.Fail(t, "Timeout Sub2")
}
case <-sub2.C:
msgCnt++
if msgCnt == 1100 {
require.Fail(t, "Timeout Sub2")
case msg := <-sub2.C:
if bytes.Equal(msg.Message().Payload, maxMsgBytes) {
return
}
}
@ -126,9 +129,9 @@ func Test1100(t *testing.T) {
go func() {
defer wg.Done()
for i := 1; i <= 1100; i++ {
for i := 1; i <= maxMsgs; i++ {
msg := createTestMsg(0)
msg.Payload = []byte(fmt.Sprint(i))
msg.Payload = int2Bytes(i)
msg.Timestamp = int64(i)
if err := wakuNode2.Publish(ctx, msg); err != nil {
require.Fail(t, "Could not publish all messages")