Rework adapters

pkg/networkservice/common/updatetoken/server_test.go

@@ -224,7 +224,7 @@ func (f *updateTokenServerSuite) TestChain() {
 
 	got, err := server.Request(context.Background(), request)
 	require.Equal(t, 3, len(got.Path.PathSegments))
-	require.Equal(t, 2, int(got.Path.Index))
+	require.Equal(t, 0, int(got.Path.Index))
 	for i, s := range got.Path.PathSegments {
 		require.Equal(t, want.Path.PathSegments[i].Name, s.Name)
 		require.Equal(t, want.Path.PathSegments[i].Token, s.Token)

pkg/networkservice/core/adapters/README.md

@@ -0,0 +1,11 @@
+## Intro
+
+This package provides adapters to translate between `NetworkServiceServer` and `NetworkServiceClient` interfaces.
+
+## Benchmarks
+
+| Benchmark                           | ns/op | allocs/op |
+|-------------------------------------|------:|----------:|
+| `BenchmarkServerToClient_Request`   |   288 |         6 |
+| `BenchmarkClientToServer_Request`   |   291 |         6 |
+| `BenchmarkNested20Adapters_Request` |  6159 |       120 |

pkg/networkservice/core/adapters/client_to_server.go

@@ -21,47 +21,38 @@ import (
 	"context"
 
 	"github.com/golang/protobuf/ptypes/empty"
+	"github.com/networkservicemesh/api/pkg/api/networkservice"
+	"google.golang.org/grpc"
 
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/next"
-
-	"github.com/networkservicemesh/api/pkg/api/networkservice"
 )
 
-type clientToServer struct {
-	client networkservice.NetworkServiceClient
-}
+type (
+	clientToServer struct {
+		client networkservice.NetworkServiceClient
+	}
+	callNextServer struct {
+		server networkservice.NetworkServiceServer
+	}
+)
 
 // NewClientToServer - returns a networkservice.NetworkServiceServer wrapped around the supplied client
 func NewClientToServer(client networkservice.NetworkServiceClient) networkservice.NetworkServiceServer {
-	return &clientToServer{client: next.NewNetworkServiceClient(client, &contextClient{})}
+	return &clientToServer{client: client}
 }
 
 func (c *clientToServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest) (*networkservice.Connection, error) {
-	doneCtx := withCapturedContext(ctx)
-	conn, err := c.client.Request(doneCtx, request)
-	if err != nil {
-		return nil, err
-	}
-	lastCtx := getCapturedContext(doneCtx)
-	if lastCtx == nil {
-		return conn, nil
-	}
-	if request == nil {
-		request = &networkservice.NetworkServiceRequest{}
-	}
-	request.Connection = conn
-	return next.Server(ctx).Request(lastCtx, request)
+	return next.NewNetworkServiceClient(c.client, &callNextServer{server: next.Server(ctx)}).Request(ctx, request)
 }
 
 func (c *clientToServer) Close(ctx context.Context, request *networkservice.Connection) (*empty.Empty, error) {
-	doneCtx := withCapturedContext(ctx)
-	conn, err := c.client.Close(doneCtx, request)
-	if err != nil {
-		return nil, err
-	}
-	lastCtx := getCapturedContext(doneCtx)
-	if lastCtx == nil {
-		return conn, nil
-	}
-	return next.Server(ctx).Close(lastCtx, request)
+	return next.NewNetworkServiceClient(c.client, &callNextServer{server: next.Server(ctx)}).Close(ctx, request)
+}
+
+func (c *callNextServer) Request(ctx context.Context, request *networkservice.NetworkServiceRequest, _ ...grpc.CallOption) (*networkservice.Connection, error) {
+	return c.server.Request(ctx, request)
+}
+
+func (c *callNextServer) Close(ctx context.Context, request *networkservice.Connection, _ ...grpc.CallOption) (*empty.Empty, error) {
+	return c.server.Close(ctx, request)
 }