Merge pull request berty#2949 from berty/revert-2920-chore/improve-gr…

…pc-bridge-error

fix(messenger): revert error details bug

api/bertyaccount.proto

@@ -213,14 +213,9 @@ message Metadata {
 }
 
 message Error {
-  // grpc error code
   GRPCErrCode grpc_error_code = 1;
-  // toplevel error
   errcode.ErrCode error_code = 2;
-  // toplevel error message
   string message = 3;
-  // detailed errors
-  errcode.ErrDetails error_details = 4;
 }
 
 enum GRPCErrCode {

go/internal/grpcutil/lazy_client.go

@@ -27,21 +27,21 @@ func NewLazyClient(cc *grpc.ClientConn) *LazyClient {
 	return &LazyClient{cc: cc}
 }
 
-func (lc *LazyClient) InvokeUnary(ctx context.Context, desc *LazyMethodDesc, in *LazyMessage, copts ...grpc.CallOption) (out *LazyMessage, err error) {
+func (lc *LazyClient) InvokeUnary(ctx context.Context, desc *LazyMethodDesc, in *LazyMessage) (out *LazyMessage, err error) {
 	out = NewLazyMessage()
-	err = grpc.Invoke(ctx, desc.Name, in, out, lc.cc, append(copts, grpc.ForceCodec(lazyCodec))...)
+	err = grpc.Invoke(ctx, desc.Name, in, out, lc.cc, grpc.ForceCodec(lazyCodec))
 	return
 }
 
-func (lc *LazyClient) InvokeStream(ctx context.Context, desc *LazyMethodDesc, in *LazyMessage, copts ...grpc.CallOption) (*LazyStream, error) {
+func (lc *LazyClient) InvokeStream(ctx context.Context, desc *LazyMethodDesc, in *LazyMessage) (*LazyStream, error) {
 	sdesc := &grpc.StreamDesc{
 		StreamName:    desc.Name,
 		ServerStreams: desc.ServerStreams,
 		ClientStreams: desc.ClientStreams,
 	}
 
 	sctx, cancel := context.WithCancel(ctx)
-	cstream, err := grpc.NewClientStream(sctx, sdesc, lc.cc, desc.Name, append(copts, grpc.ForceCodec(lazyCodec))...)
+	cstream, err := grpc.NewClientStream(sctx, sdesc, lc.cc, desc.Name, grpc.ForceCodec(lazyCodec))
 	if err != nil {
 		cancel()
 		return nil, err

go/pkg/bertyaccount/service_grpc.go

@@ -8,7 +8,6 @@ import (
 
 	ma "github.com/multiformats/go-multiaddr"
 	"github.com/pkg/errors"
-	"google.golang.org/grpc"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
@@ -40,16 +39,19 @@ func (s *service) ClientInvokeUnary(ctx context.Context, req *ClientInvokeUnary_
 	}
 
 	// create fake proto message
-	trailer := metadata.MD{}
 	in := grpcutil.NewLazyMessage().FromBytes(req.Payload)
-	out, err := serviceClient.InvokeUnary(uctx, desc, in, grpc.Trailer(&trailer))
-	res.Error = getServiceError(err)
+	out, err := serviceClient.InvokeUnary(ctx, desc, in)
+	if err != nil {
+		res.Error = getServiceError(err)
+		return res, nil
+	}
+
 	res.Payload = out.Bytes()
-	res.Trailer = convertMetadata(trailer)
+	res.Trailer = getMetadataFromContext(uctx)
 	return res, nil
 }
 
-// CreateStream create a stream
+// // CreateStream create a stream
 func (s *service) CreateClientStream(ctx context.Context, req *ClientCreateStream_Request) (*ClientCreateStream_Reply, error) {
 	serviceClient, err := s.getServiceClient()
 	if err != nil {
@@ -96,11 +98,10 @@ func (s *service) ClientStreamSend(ctx context.Context, req *ClientStreamSend_Re
 	res := &ClientStreamSend_Reply{StreamId: id}
 
 	in := grpcutil.NewLazyMessage().FromBytes(req.Payload)
-	err = cstream.SendMsg(in)
-	res.Error = getServiceError(err)
-
-	if err != nil {
+	if err := cstream.SendMsg(in); err != nil {
+		res.Error = getServiceError(err)
 		res.Trailer = convertMetadata(cstream.Trailer())
+
 		s.muStreams.Lock()
 		delete(s.streams, id)
 		s.muStreams.Unlock()
@@ -200,6 +201,15 @@ func newOutgoingContext(ctx context.Context, md []*Metadata) context.Context {
 	return metadata.NewOutgoingContext(ctx, outmd)
 }
 
+func getMetadataFromContext(ctx context.Context) []*Metadata {
+	// get trailer
+	if outmd, ok := metadata.FromIncomingContext(ctx); ok {
+		return convertMetadata(outmd)
+	}
+
+	return nil
+}
+
 func convertMetadata(in metadata.MD) []*Metadata {
 	out := make([]*Metadata, in.Len())
 	i := 0
@@ -216,24 +226,25 @@ func convertMetadata(in metadata.MD) []*Metadata {
 
 func getServiceError(err error) *Error {
 	if err == nil {
-		return &Error{}
+		return nil
 	}
 
-	grpcErrCode := GRPCErrCode_OK
+	var errCode errcode.ErrCode
+	var grpcErrCode GRPCErrCode
+
 	if s := status.Convert(err); s.Code() != codes.OK {
 		grpcErrCode = GRPCErrCode(s.Code())
 	}
 
-	errCode := errcode.Undefined
-	errCodes := errcode.Codes(err)
-	if len(errCodes) > 0 {
-		errCode = errCodes[0]
+	if code := errcode.Code(err); code > 0 {
+		errCode = code
+	} else {
+		errCode = errcode.Undefined
 	}
 
 	return &Error{
 		GrpcErrorCode: grpcErrCode,
 		ErrorCode:     errCode,
-		ErrorDetails:  &errcode.ErrDetails{Codes: errCodes},
 		Message:       err.Error(),
 	}
 }
@@ -242,15 +253,13 @@ func (s *service) clientStreamRecv(id string, cstream *grpcutil.LazyStream) *Cli
 	res := &ClientStreamRecv_Reply{StreamId: id}
 
 	out := grpcutil.NewLazyMessage()
-	err := cstream.RecvMsg(out)
-	res.Error = getServiceError(err)
+	if err := cstream.RecvMsg(out); err != nil {
+		s.muStreams.Lock()
 
-	if err != nil {
 		res.Error = getServiceError(err)
 		res.Trailer = convertMetadata(cstream.Trailer())
-
-		s.muStreams.Lock()
 		delete(s.streams, id)
+
 		s.muStreams.Unlock()
 		return res
 	}