test: add ready channel to sync ready state for node

Author: geolffreym

events.go

@@ -2,6 +2,7 @@ package noise
 
 import (
 	"context"
+	"net"
 	"unsafe"
 )
 
@@ -15,6 +16,8 @@ const (
 	MessageReceived
 	// Closed peer connection
 	PeerDisconnected
+	// Emitted when the node is ready to accept incoming connections
+	SelfListening
 )
 
 // events handle event exchange between [Node] and network.
@@ -30,6 +33,7 @@ func newEvents() *events {
 	broker.Register(NewPeerDetected, subscriber)
 	broker.Register(MessageReceived, subscriber)
 	broker.Register(PeerDisconnected, subscriber)
+	broker.Register(SelfListening, subscriber)
 
 	return &events{
 		broker,
@@ -60,6 +64,14 @@ func (e *events) PeerDisconnected(peer *peer) {
 	e.broker.Publish(signal)
 }
 
+// SelfListening dispatch event when node is ready.
+func (e *events) SelfListening(listener net.Listener) {
+	// Emit new notification
+	header := header{nil, SelfListening}
+	signal := Signal{header, listener.Addr().String()}
+	e.broker.Publish(signal)
+}
+
 // NewMessage dispatch event when a new message is received.
 func (e *events) NewMessage(peer *peer, msg []byte) {
 	// Emit new notification

handshake_test.go

@@ -0,0 +1 @@
+package noise

node.go

@@ -226,7 +226,8 @@ func (n *Node) Listen() error {
 	}
 
 	log.Printf("listening on %s", addr)
-	n.listener = listener // keep reference to current listener
+	n.events.SelfListening(listener) // emit listening event
+	n.listener = listener            // keep reference to current listener
 
 	for {
 		// Block/Hold while waiting for new incoming connection

node_test.go

@@ -32,6 +32,7 @@ func TestTwoNodesHandshakeTrace(t *testing.T) {
 		"handshake complete", // Handshake complete
 	}
 
+	ready := make(chan bool)
 	nodeASocket := "127.0.0.1:9090"
 	nodeBSocket := "127.0.0.1:9091"
 	configurationA := config.New()
@@ -42,11 +43,21 @@ func TestTwoNodesHandshakeTrace(t *testing.T) {
 
 	nodeA := New(configurationA)
 	nodeB := New(configurationB)
+
+	go func() {
+		signals, cancel := nodeA.Signals()
+		for signal := range signals {
+			if signal.Type() == SelfListening {
+				cancel()
+				ready <- true
+			}
+		}
+	}()
+
 	go nodeA.Listen()
 	go nodeB.Listen()
+	<-ready
 
-	// Wait for node ready <- could be improved using channel sync
-	<-time.After(time.Second / 10)
 	nodeB.Dial(nodeASocket)
 	nodeA.Close()
 	nodeB.Close()