From 82ec44fcfa75f83058a0bac5fa87b8062a3fc5a7 Mon Sep 17 00:00:00 2001 From: Richard Ramos Date: Mon, 1 Nov 2021 20:12:18 -0400 Subject: [PATCH] fix: lint and failing test --- waku/v2/node/connectedness_test.go | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/waku/v2/node/connectedness_test.go b/waku/v2/node/connectedness_test.go index 1cd8b508..a5d2eb0c 100644 --- a/waku/v2/node/connectedness_test.go +++ b/waku/v2/node/connectedness_test.go @@ -34,6 +34,7 @@ func TestConnectionStatusChanges(t *testing.T) { WithHostAddress([]*net.TCPAddr{hostAddr2}), WithWakuRelay(), ) + require.NoError(t, err) err = node2.Start() require.NoError(t, err) @@ -49,8 +50,11 @@ func TestConnectionStatusChanges(t *testing.T) { err = node3.Start() require.NoError(t, err) - node1.DialPeer(ctx, node2.ListenAddresses()[0].String()) - node1.DialPeer(ctx, node3.ListenAddresses()[0].String()) + err = node1.DialPeer(ctx, node2.ListenAddresses()[0].String()) + require.NoError(t, err) + + err = node1.DialPeer(ctx, node3.ListenAddresses()[0].String()) + require.NoError(t, err) var wg sync.WaitGroup @@ -77,6 +81,8 @@ func TestConnectionStatusChanges(t *testing.T) { go func() { defer wg.Done() + node3.Stop() + connStatus := <-connStatusChan _, ok := connStatus.Peers[node3.Host().ID()] require.True(t, connStatus.IsOnline) @@ -85,13 +91,15 @@ func TestConnectionStatusChanges(t *testing.T) { require.Len(t, node1.Host().Network().Peers(), 1) // No peers connected }() - node3.Stop() wg.Wait() wg.Add(1) go func() { defer wg.Done() + err = node1.ClosePeerById(node2.Host().ID()) + require.NoError(t, err) + connStatus := <-connStatusChan _, ok := connStatus.Peers[node3.Host().ID()] require.False(t, connStatus.IsOnline) // Peers are not connected. Should be offline @@ -100,14 +108,15 @@ func TestConnectionStatusChanges(t *testing.T) { require.Len(t, node1.Host().Network().Peers(), 0) // No peers connected }() - err = node1.ClosePeerById(node2.Host().ID()) - require.NoError(t, err) wg.Wait() wg.Add(1) go func() { defer wg.Done() + err = node1.DialPeerByID(ctx, node2.Host().ID()) + require.NoError(t, err) + connStatus := <-connStatusChan _, ok := connStatus.Peers[node2.Host().ID()] require.True(t, connStatus.IsOnline) // Peers2 is connected. Should be online @@ -116,7 +125,5 @@ func TestConnectionStatusChanges(t *testing.T) { require.Len(t, node1.Host().Network().Peers(), 1) }() - err = node1.DialPeerByID(ctx, node2.Host().ID()) - require.NoError(t, err) wg.Wait() }