Fix interoptests and rewrite decode

tonic-macros/src/client.rs

@@ -33,6 +33,7 @@ fn generate_unary(method: &Method, proto: &str, path: String) -> TokenStream {
     quote! {
         pub async fn #ident (&mut self, request: tonic::Request<#request>)
             -> Result<tonic::Response<#response>, tonic::Status> {
+           self.inner.ready().await?;
            let codec = tonic::codec::ProstCodec::new();
            let path = http::uri::PathAndQuery::from_static(#path);
            self.inner.unary(request, path, codec).await
@@ -48,6 +49,7 @@ fn generate_server_streaming(method: &Method, proto: &str, path: String) -> Toke
     quote! {
         pub async fn #ident (&mut self, request: tonic::Request<#request>)
             -> Result<tonic::Response<tonic::codec::Streaming<#response>>, tonic::Status> {
+           self.inner.ready().await?;
            let codec = tonic::codec::ProstCodec::new();
            let path = http::uri::PathAndQuery::from_static(#path);
            self.inner.server_streaming(request, path, codec).await
@@ -65,6 +67,7 @@ fn generate_client_streaming(method: &Method, proto: &str, path: String) -> Toke
             -> Result<tonic::Response<#response>, tonic::Status>
             where S: tonic::_codegen::Stream<Item = Result<#request, tonic::Status>> + Send + 'static,
         {
+           self.inner.ready().await?;
            let codec = tonic::codec::ProstCodec::new();
            let path = http::uri::PathAndQuery::from_static(#path);
            let request = request.map(|s| Box::pin(s));
@@ -83,6 +86,7 @@ fn generate_streaming(method: &Method, proto: &str, path: String) -> TokenStream
             -> Result<tonic::Response<tonic::codec::Streaming<#response>>, tonic::Status>
             where S: tonic::_codegen::Stream<Item = Result<#request, tonic::Status>> + Send + 'static,
         {
+           self.inner.ready().await?;
            let codec = tonic::codec::ProstCodec::new();
            let path = http::uri::PathAndQuery::from_static(#path);
            let request = request.map(|s| Box::pin(s));

tonic-macros/src/lib.rs

@@ -29,12 +29,16 @@ pub fn client(attr: TokenStream) -> TokenStream {
         where T: tonic::GrpcService<tonic::body::BoxBody>,
               T::ResponseBody: tonic::body::Body + tonic::_codegen::HttpBody + Send + 'static,
               <T::ResponseBody as tonic::_codegen::HttpBody>::Error: Into<tonic::error::Error> + Send,
-              <T::ResponseBody as tonic::_codegen::HttpBody>::Data: Send, {
+              <T::ResponseBody as tonic::_codegen::HttpBody>::Data: Into<bytes::Bytes> + Send, {
             pub fn new(inner: T) -> Self {
                 let inner = tonic::client::Grpc::new(inner);
                 Self { inner }
             }
 
+            pub async fn ready(&mut self) -> Result<(), tonic::Status> {
+                self.inner.ready().await
+            }
+
             #methods
         }
 

tonic-macros/src/service.rs

@@ -106,7 +106,7 @@ pub(crate) fn generate(service: ServiceDef) -> TokenStream {
             }
         }
 
-        impl Service<http::Request<tower_h2::RecvBody>> for #server_service {
+        impl Service<http::Request<hyper::Body>> for #server_service {
             type Response = http::Response<tonic::BoxBody>;
             type Error = tonic::error::Never;
             type Future = BoxFuture<Self::Response, Self::Error>;
@@ -115,7 +115,7 @@ pub(crate) fn generate(service: ServiceDef) -> TokenStream {
                 Poll::Ready(Ok(()))
             }
 
-            fn call(&mut self, req: http::Request<tower_h2::RecvBody>) -> Self::Future {
+            fn call(&mut self, req: http::Request<hyper::Body>) -> Self::Future {
                 let inner = self.inner.clone();
 
                 match req.uri().path() {