Feature/route finder single route

cmd/skywire-cli/commands/rtfind/root.go

@@ -1,6 +1,7 @@
 package rtfind
 
 import (
+	"context"
 	"fmt"
 	"time"
 
@@ -34,10 +35,12 @@ var RootCmd = &cobra.Command{
 		internal.Catch(srcPK.Set(args[0]))
 		internal.Catch(dstPK.Set(args[1]))
 
-		forward, reverse, err := rfc.PairedRoutes(srcPK, dstPK, frMinHops, frMaxHops)
+		ctx := context.Background()
+		routes, err := rfc.FindRoutes(ctx, [][2]cipher.PubKey{{srcPK, dstPK}, {dstPK, srcPK}},
+			&client.RouteOptions{MinHops: frMinHops, MaxHops: frMaxHops})
 		internal.Catch(err)
 
-		fmt.Println("forward: ", forward)
-		fmt.Println("reverse: ", reverse)
+		fmt.Println("forward: ", routes[0][0])
+		fmt.Println("reverse: ", routes[1][0])
 	},
 }

pkg/route-finder/client/client.go

@@ -21,18 +21,16 @@ const defaultContextTimeout = 10 * time.Second
 
 var log = logging.MustGetLogger("route-finder")
 
-// GetRoutesRequest parses json body for /routes endpoint request
-type GetRoutesRequest struct {
-	SrcPK   cipher.PubKey `json:"src_pk,omitempty"`
-	DstPK   cipher.PubKey `json:"dst_pk,omitempty"`
-	MinHops uint16        `json:"min_hops,omitempty"`
-	MaxHops uint16        `json:"max_hops,omitempty"`
+// RouteOptions for FindRoutesRequest. If nil MinHops and MaxHops will take default values
+type RouteOptions struct {
+	MinHops uint16
+	MaxHops uint16
 }
 
-// GetRoutesResponse encodes the json body of /routes response
-type GetRoutesResponse struct {
-	Forward []routing.Route `json:"forward"`
-	Reverse []routing.Route `json:"response"`
+// FindRoutesRequest parses json body for /routes endpoint request
+type FindRoutesRequest struct {
+	Edges [][2]cipher.PubKey
+	Opts  *RouteOptions
 }
 
 // HTTPResponse represents http response struct
@@ -49,7 +47,7 @@ type HTTPError struct {
 
 // Client implements route finding operations.
 type Client interface {
-	PairedRoutes(source, destiny cipher.PubKey, minHops, maxHops uint16) ([]routing.Route, []routing.Route, error)
+	FindRoutes(ctx context.Context, rts [][2]cipher.PubKey, opts *RouteOptions) ([][]routing.Route, error)
 }
 
 // APIClient implements Client interface
@@ -72,23 +70,21 @@ func NewHTTP(addr string, apiTimeout time.Duration) Client {
 	}
 }
 
-// PairedRoutes returns routes from source skywire visor to destiny, that has at least the given minHops and as much
-// the given maxHops as well as the reverse routes from destiny to source.
-func (c *apiClient) PairedRoutes(source, destiny cipher.PubKey, minHops, maxHops uint16) ([]routing.Route, []routing.Route, error) {
-	requestBody := &GetRoutesRequest{
-		SrcPK:   source,
-		DstPK:   destiny,
-		MinHops: minHops,
-		MaxHops: maxHops,
+// FindRoutes returns routes from source skywire visor to destiny, that has at least the given minHops and as much
+// the given maxHops.
+func (c *apiClient) FindRoutes(ctx context.Context, rts [][2]cipher.PubKey, opts *RouteOptions) ([][]routing.Route, error) {
+	requestBody := &FindRoutesRequest{
+		Edges: rts,
+		Opts:  opts,
 	}
 	marshaledBody, err := json.Marshal(requestBody)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	req, err := http.NewRequest(http.MethodGet, c.addr+"/routes", bytes.NewBuffer(marshaledBody))
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 	req.Header.Set("Content-Type", "application/json")
 	ctx, cancel := context.WithTimeout(context.Background(), c.apiTimeout)
@@ -104,27 +100,27 @@ func (c *apiClient) PairedRoutes(source, destiny cipher.PubKey, minHops, maxHops
 		}()
 	}
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
 	if res.StatusCode != http.StatusOK {
 		var apiErr HTTPResponse
 
 		err = json.NewDecoder(res.Body).Decode(&apiErr)
 		if err != nil {
-			return nil, nil, err
+			return nil, err
 		}
 
-		return nil, nil, errors.New(apiErr.Error.Message)
+		return nil, errors.New(apiErr.Error.Message)
 	}
 
-	var routes GetRoutesResponse
+	var routes [][]routing.Route
 	err = json.NewDecoder(res.Body).Decode(&routes)
 	if err != nil {
-		return nil, nil, err
+		return nil, err
 	}
 
-	return routes.Forward, routes.Reverse, nil
+	return routes, nil
 }
 
 func sanitizedAddr(addr string) string {

pkg/route-finder/client/mock.go

@@ -1,6 +1,8 @@
 package client
 
 import (
+	"context"
+	"fmt"
 	"github.com/skycoin/dmsg/cipher"
 
 	"github.com/skycoin/skywire/pkg/routing"
@@ -23,27 +25,24 @@ func (r *mockClient) SetError(err error) {
 	r.err = err
 }
 
-// PairedRoutes implements Client for MockClient
-func (r *mockClient) PairedRoutes(src, dst cipher.PubKey, minHops, maxHops uint16) ([]routing.Route, []routing.Route, error) {
+// FindRoutes implements Client for MockClient
+func (r *mockClient) FindRoutes(ctx context.Context, rts [][2]cipher.PubKey, opts *RouteOptions) ([][]routing.Route, error) {
 	if r.err != nil {
-		return nil, nil, r.err
+		return nil, r.err
 	}
 
-	return []routing.Route{
-			{
-				&routing.Hop{
-					From:      src,
-					To:        dst,
-					Transport: transport.MakeTransportID(src, dst, ""),
-				},
-			},
-		}, []routing.Route{
+	if len(rts) == 0 {
+		return nil, fmt.Errorf("no edges provided to returns routes from")
+	}
+	return [][]routing.Route{
+		{
 			{
 				&routing.Hop{
-					From:      src,
-					To:        dst,
-					Transport: transport.MakeTransportID(src, dst, ""),
+					From:      rts[0][0],
+					To:        rts[0][1],
+					Transport: transport.MakeTransportID(rts[0][0], rts[0][1], ""),
 				},
 			},
-		}, nil
+		},
+	}, nil
 }

pkg/router/router.go

@@ -416,7 +416,9 @@ func (r *Router) fetchBestRoutes(source, destination cipher.PubKey) (fwd routing
 	defer timer.Stop()
 
 fetchRoutesAgain:
-	fwdRoutes, revRoutes, err := r.conf.RouteFinder.PairedRoutes(source, destination, minHops, maxHops)
+	ctx := context.Background()
+	routes, err := r.conf.RouteFinder.FindRoutes(ctx, [][2]cipher.PubKey{{source, destination}, {destination, source}},
+		&routeFinder.RouteOptions{MinHops: minHops, MaxHops: maxHops})
 	if err != nil {
 		select {
 		case <-timer.C:
@@ -426,8 +428,8 @@ fetchRoutesAgain:
 		}
 	}
 
-	r.Logger.Infof("Found routes Forward: %s. Reverse %s", fwdRoutes, revRoutes)
-	return fwdRoutes[0], revRoutes[0], nil
+	r.Logger.Infof("Found routes Forward: %s. Reverse %s", routes[0], routes[1])
+	return routes[0][0], routes[1][0], nil
 }
 
 // SetupIsTrusted checks if setup node is trusted.