Fix up the topology tests to work with master

examples/basic/setup.go

@@ -44,6 +44,8 @@ func SetupCluster(nodes []ClusterNode) error {
 		node.SetNet(net)
 
 		go net.Listen()
+
+		<-net.Listening
 	}
 
 	return nil

examples/topologies/topo_node_test.go

@@ -19,8 +19,8 @@ func (e *TopoNode) Host() string {
 	return e.h
 }
 
-func (e *TopoNode) Port() int {
-	return e.p
+func (e *TopoNode) Port() uint16 {
+	return uint16(e.p)
 }
 
 func (e *TopoNode) Peers() []string {
@@ -36,11 +36,9 @@ func (e *TopoNode) SetNet(n *network.Network) {
 }
 
 // Handle implements the network interface callback
-func (e *TopoNode) Handle(client *network.PeerClient, raw *network.IncomingMessage) error {
-	message := raw.Message.(*messages.BasicMessage)
-
+func (e *TopoNode) Handle(ctx *network.MessageContext) error {
+	message := ctx.Message().(*messages.BasicMessage)
 	e.Messages = append(e.Messages, message)
-
 	return nil
 }
 

examples/topologies/topologies_test.go

@@ -210,14 +210,14 @@ func broadcastNode(t *testing.T, nodes []*TopoNode, sendingNodeIdx int) {
 		} else {
 			// this is a receiving node, it should have just the one message buffered up
 			if result := nodes[i].PopMessage(); result == nil {
-				t.Errorf("expected a message in (sending node %d) receiving node %d but it was blank", sendingNodeIdx, i)
+				t.Errorf("expected a message for node %d --> %d, but it was blank", sendingNodeIdx, i)
 			} else {
 				if result.Message != testMessage {
-					t.Errorf("expected message %s in (sending node %d) receiving node %d but got %v", testMessage, sendingNodeIdx, i, result)
+					t.Errorf("expected message %s for node %d --> %d, but got %v", testMessage, sendingNodeIdx, i, result)
 				}
 			}
 			if len(nodes[i].Messages) > 0 {
-				t.Errorf("expected no messages buffered in (sending node %d) receiving node %d, found: %v", sendingNodeIdx, i, nodes[i].Messages)
+				t.Errorf("expected no messages for node %d --> %d, but found: %v", sendingNodeIdx, i, nodes[i].Messages)
 			}
 		}
 	}