Client.Call(): do not return error if no Status is set (gRPC v1.23 and up)

thaJeztah · thaJeztah · commit 17f4d32234dd · 2019-08-26T19:18:48.000+02:00
To account for grpc/grpc-go@5da5b1f, which is part of gRPC v1.23.0 and up, and after which gRPC no longer sets a Status if no error occured. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
diff --git a/client.go b/client.go
@@ -134,11 +134,11 @@ func (c *Client) Call(ctx context.Context, service, method string, req, resp int
 		return err
 	}
 
-	if cresp.Status == nil {
-		return errors.New("no status provided on response")
+	if cresp.Status != nil {
+		return status.ErrorProto(cresp.Status)
 	}
 
-	return status.ErrorProto(cresp.Status)
+	return nil
 }
 
 func (c *Client) dispatch(ctx context.Context, req *Request, resp *Response) error {

Original file line number	Diff line number	Diff line change
`@@ -134,11 +134,11 @@ func (c *Client) Call(ctx context.Context, service, method string, req, resp int`
`134`	`134`	`return err`
`135`	`135`	`}`
`136`	`136`
`137`		`- if cresp.Status == nil {`
`138`		`- return errors.New("no status provided on response")`
	`137`	`+ if cresp.Status != nil {`
	`138`	`+ return status.ErrorProto(cresp.Status)`
`139`	`139`	`}`
`140`	`140`
`141`		`- return status.ErrorProto(cresp.Status)`
	`141`	`+ return nil`
`142`	`142`	`}`
`143`	`143`
`144`	`144`	`func (c Client) dispatch(ctx context.Context, req Request, resp *Response) error {`