Neighbour is now peer. Neighbourhood is Peers. Small refactor.

network/handler/handler.go

@@ -16,6 +16,74 @@ type Network struct {
 	Network network.Network
 }
 
+// ListNodes returns a list of all accessible nodes in the network
+func (n *Network) ListNodes(ctx context.Context, req *pbNet.ListRequest, resp *pbNet.ListResponse) error {
+	nodes := n.Network.Nodes()
+
+	var respNodes []*pbNet.Node
+	for _, node := range nodes {
+		respNode := &pbNet.Node{
+			Id:      node.Id(),
+			Address: node.Address(),
+		}
+		respNodes = append(respNodes, respNode)
+	}
+
+	resp.Nodes = respNodes
+
+	return nil
+}
+
+// ListPeers returns a list of all the nodes the node has a direct link with
+func (n *Network) ListPeers(ctx context.Context, req *pbNet.PeerRequest, resp *pbNet.PeerResponse) error {
+	// extract the id of the node to query
+	id := req.Id
+	// if no id is passed, we assume local node
+	if id == "" {
+		id = n.Network.Id()
+	}
+
+	// get all the nodes in the network
+	nodes := n.Network.Nodes()
+
+	// sort the slice of nodes
+	sort.Slice(nodes, func(i, j int) bool { return nodes[i].Id() <= nodes[j].Id() })
+	// find a node with a given id
+	i := sort.Search(len(nodes), func(j int) bool { return nodes[j].Id() >= id })
+
+	var nodePeers []*pbNet.Node
+	// collect all the node peers into slice
+	if i < len(nodes) && nodes[i].Id() == id {
+		for _, peer := range nodes[i].Peers() {
+			// don't return yourself in response
+			if peer.Id() == n.Network.Id() {
+				continue
+			}
+			pbPeer := &pbNet.Node{
+				Id:      peer.Id(),
+				Address: peer.Address(),
+			}
+			nodePeers = append(nodePeers, pbPeer)
+		}
+	}
+
+	// requested node
+	node := &pbNet.Node{
+		Id:      nodes[i].Id(),
+		Address: nodes[i].Address(),
+	}
+
+	// creaate peers answer
+	peers := &pbNet.Peers{
+		Node:  node,
+		Peers: nodePeers,
+	}
+
+	resp.Peers = peers
+
+	return nil
+}
+
 // ListRoutes returns a list of routing table routes
 func (n *Network) ListRoutes(ctx context.Context, req *pbRtr.Request, resp *pbRtr.ListResponse) error {
 	routes, err := n.Network.Options().Router.Table().List()
@@ -41,71 +109,3 @@ func (n *Network) ListRoutes(ctx context.Context, req *pbRtr.Request, resp *pbRt
 
 	return nil
 }
-
-// ListNodes returns a list of all accessible nodes in the network
-func (n *Network) ListNodes(ctx context.Context, req *pbNet.ListRequest, resp *pbNet.ListResponse) error {
-	nodes := n.Network.Nodes()
-
-	var respNodes []*pbNet.Node
-	for _, node := range nodes {
-		respNode := &pbNet.Node{
-			Id:      node.Id(),
-			Address: node.Address(),
-		}
-		respNodes = append(respNodes, respNode)
-	}
-
-	resp.Nodes = respNodes
-
-	return nil
-}
-
-// Neighbourhood returns a list of immediate neighbours
-func (n *Network) Neighbourhood(ctx context.Context, req *pbNet.NeighbourhoodRequest, resp *pbNet.NeighbourhoodResponse) error {
-	// extract the id of the node to query
-	id := req.Id
-	// if no id is passed, we assume local node
-	if id == "" {
-		id = n.Network.Id()
-	}
-
-	// get all the nodes in the network
-	nodes := n.Network.Nodes()
-
-	// sort the slice of nodes
-	sort.Slice(nodes, func(i, j int) bool { return nodes[i].Id() <= nodes[j].Id() })
-	// find a node with a given id
-	i := sort.Search(len(nodes), func(j int) bool { return nodes[j].Id() >= id })
-
-	var neighbours []*pbNet.Node
-	// collect all the nodes in the neighbourhood of the found node
-	if i < len(nodes) && nodes[i].Id() == id {
-		for _, neighbour := range nodes[i].Neighbourhood() {
-			// don't return yourself in response
-			if neighbour.Id() == n.Network.Id() {
-				continue
-			}
-			pbNeighbour := &pbNet.Node{
-				Id:      neighbour.Id(),
-				Address: neighbour.Address(),
-			}
-			neighbours = append(neighbours, pbNeighbour)
-		}
-	}
-
-	// requested neighbourhood node
-	node := &pbNet.Node{
-		Id:      nodes[i].Id(),
-		Address: nodes[i].Address(),
-	}
-
-	// creaate neighbourhood answer
-	neighbourhood := &pbNet.Neighbourhood{
-		Node:       node,
-		Neighbours: neighbours,
-	}
-
-	resp.Neighbourhood = neighbourhood
-
-	return nil
-}