small refactor and logs
This commit is contained in:
parent
703352d003
commit
27a1f5fdc4
|
@ -335,7 +335,7 @@ func TestPeerExchange(t *testing.T) {
|
||||||
Shards: []uint16{64},
|
Shards: []uint16{64},
|
||||||
PeerExchange: false,
|
PeerExchange: false,
|
||||||
Discv5UdpPort: 9001,
|
Discv5UdpPort: 9001,
|
||||||
TcpPort: 62000,
|
TcpPort: 60001,
|
||||||
}
|
}
|
||||||
|
|
||||||
discV5Node, err := New(nil, "", &discV5NodeConfig, logger.Named("discV5Node"), nil, nil, nil, nil)
|
discV5Node, err := New(nil, "", &discV5NodeConfig, logger.Named("discV5Node"), nil, nil, nil, nil)
|
||||||
|
@ -363,28 +363,30 @@ func TestPeerExchange(t *testing.T) {
|
||||||
PeerExchange: true,
|
PeerExchange: true,
|
||||||
Discv5UdpPort: 9000,
|
Discv5UdpPort: 9000,
|
||||||
Discv5BootstrapNodes: []string{discv5NodeEnr.String()},
|
Discv5BootstrapNodes: []string{discv5NodeEnr.String()},
|
||||||
TcpPort: 61000,
|
TcpPort: 60002,
|
||||||
}
|
}
|
||||||
|
|
||||||
pxServerNode, err := New(nil, "", &pxServerConfig, logger.Named("pxServerNode"), nil, nil, nil, nil)
|
pxServerNode, err := New(nil, "", &pxServerConfig, logger.Named("pxServerNode"), nil, nil, nil, nil)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, pxServerNode.Start())
|
require.NoError(t, pxServerNode.Start())
|
||||||
|
|
||||||
|
fmt.Println("------ GABRIEL started big sleep")
|
||||||
time.Sleep(10 * time.Second)
|
time.Sleep(10 * time.Second)
|
||||||
|
fmt.Println("------ GABRIEL finished big sleep")
|
||||||
|
|
||||||
serverNodeMa, err := pxServerNode.ListenAddresses()
|
serverNodeMa, err := pxServerNode.ListenAddresses()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NotNil(t, serverNodeMa)
|
require.NotNil(t, serverNodeMa)
|
||||||
|
|
||||||
|
discv5Peers, err := discV5Node.GetPeerIdsFromPeerStore()
|
||||||
|
require.NoError(t, err)
|
||||||
|
fmt.Println("------ GABRIEL discV5Node peers: ", discv5Peers)
|
||||||
|
|
||||||
// Sanity check, not great, but it's probably helpful
|
// Sanity check, not great, but it's probably helpful
|
||||||
options := func(b *backoff.ExponentialBackOff) {
|
options := func(b *backoff.ExponentialBackOff) {
|
||||||
b.MaxElapsedTime = 30 * time.Second
|
b.MaxElapsedTime = 30 * time.Second
|
||||||
}
|
}
|
||||||
|
|
||||||
discv5Peers, err := discV5Node.GetPeerIdsFromPeerStore()
|
|
||||||
require.NoError(t, err)
|
|
||||||
fmt.Println("------ GABRIEL discV5Node peers: ", discv5Peers)
|
|
||||||
|
|
||||||
// Check that pxServerNode has discV5Node in its Peer Store
|
// Check that pxServerNode has discV5Node in its Peer Store
|
||||||
err = tt.RetryWithBackOff(func() error {
|
err = tt.RetryWithBackOff(func() error {
|
||||||
peers, err := pxServerNode.GetPeerIdsFromPeerStore()
|
peers, err := pxServerNode.GetPeerIdsFromPeerStore()
|
||||||
|
@ -403,8 +405,6 @@ func TestPeerExchange(t *testing.T) {
|
||||||
}, options)
|
}, options)
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
||||||
time.Sleep(1 * time.Second)
|
|
||||||
|
|
||||||
// start light node which use PeerExchange to discover peers
|
// start light node which use PeerExchange to discover peers
|
||||||
pxClientConfig := WakuConfig{
|
pxClientConfig := WakuConfig{
|
||||||
EnableRelay: false,
|
EnableRelay: false,
|
||||||
|
@ -414,7 +414,7 @@ func TestPeerExchange(t *testing.T) {
|
||||||
Shards: []uint16{64},
|
Shards: []uint16{64},
|
||||||
PeerExchange: true,
|
PeerExchange: true,
|
||||||
Discv5UdpPort: 9002,
|
Discv5UdpPort: 9002,
|
||||||
TcpPort: 62000,
|
TcpPort: 60003,
|
||||||
PeerExchangeNode: serverNodeMa[0].String(),
|
PeerExchangeNode: serverNodeMa[0].String(),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -422,6 +422,7 @@ func TestPeerExchange(t *testing.T) {
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.NoError(t, lightNode.Start())
|
require.NoError(t, lightNode.Start())
|
||||||
|
|
||||||
|
time.Sleep(1 * time.Second)
|
||||||
|
|
||||||
pxServerPeerId, err := pxServerNode.PeerID()
|
pxServerPeerId, err := pxServerNode.PeerID()
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
|
|
Loading…
Reference in New Issue