From df8dd896daa8e722a1cebc61cd8e03aca6ecb64c Mon Sep 17 00:00:00 2001 From: tottoto Date: Tue, 6 Dec 2022 02:08:41 +0900 Subject: [PATCH] chore(examples): Remove dummy echo implementation (#1178) --- examples/build.rs | 2 ++ examples/proto/unaryecho/echo.proto | 37 +++++++++++++++++++++ examples/src/authentication/client.rs | 2 +- examples/src/authentication/server.rs | 32 ++---------------- examples/src/dynamic_load_balance/client.rs | 2 +- examples/src/dynamic_load_balance/server.rs | 32 ++---------------- examples/src/hyper_warp_multiplex/client.rs | 2 +- examples/src/hyper_warp_multiplex/server.rs | 30 +---------------- examples/src/load_balance/client.rs | 2 +- examples/src/load_balance/server.rs | 32 ++---------------- examples/src/multiplex/client.rs | 2 +- examples/src/multiplex/server.rs | 31 +---------------- examples/src/tls/client.rs | 2 +- examples/src/tls/client_rustls.rs | 2 +- examples/src/tls/server.rs | 32 ++---------------- examples/src/tls/server_rustls.rs | 33 ++---------------- examples/src/tls_client_auth/client.rs | 2 +- examples/src/tls_client_auth/server.rs | 30 +---------------- 18 files changed, 61 insertions(+), 246 deletions(-) create mode 100644 examples/proto/unaryecho/echo.proto diff --git a/examples/build.rs b/examples/build.rs index 392d5a6..892b0d9 100644 --- a/examples/build.rs +++ b/examples/build.rs @@ -14,6 +14,8 @@ fn main() { tonic_build::compile_protos("proto/echo/echo.proto").unwrap(); + tonic_build::compile_protos("proto/unaryecho/echo.proto").unwrap(); + tonic_build::configure() .server_mod_attribute("attrs", "#[cfg(feature = \"server\")]") .server_attribute("Echo", "#[derive(PartialEq)]") diff --git a/examples/proto/unaryecho/echo.proto b/examples/proto/unaryecho/echo.proto new file mode 100644 index 0000000..94743e1 --- /dev/null +++ b/examples/proto/unaryecho/echo.proto @@ -0,0 +1,37 @@ +/* + * + * Copyright 2018 gRPC authors. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + + syntax = "proto3"; + + package grpc.examples.unaryecho; + + // EchoRequest is the request for echo. + message EchoRequest { + string message = 1; + } + + // EchoResponse is the response for echo. + message EchoResponse { + string message = 1; + } + + // Echo is the echo service. + service Echo { + // UnaryEcho is unary echo. + rpc UnaryEcho(EchoRequest) returns (EchoResponse) {} + } diff --git a/examples/src/authentication/client.rs b/examples/src/authentication/client.rs index 2fa83eb..2f0a17c 100644 --- a/examples/src/authentication/client.rs +++ b/examples/src/authentication/client.rs @@ -1,5 +1,5 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use pb::{echo_client::EchoClient, EchoRequest}; diff --git a/examples/src/authentication/server.rs b/examples/src/authentication/server.rs index 289eaf8..d0a59cb 100644 --- a/examples/src/authentication/server.rs +++ b/examples/src/authentication/server.rs @@ -1,14 +1,11 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } -use futures::Stream; use pb::{EchoRequest, EchoResponse}; -use std::pin::Pin; -use tonic::{metadata::MetadataValue, transport::Server, Request, Response, Status, Streaming}; +use tonic::{metadata::MetadataValue, transport::Server, Request, Response, Status}; type EchoResult = Result, Status>; -type ResponseStream = Pin> + Send>>; #[derive(Default)] pub struct EchoServer; @@ -19,31 +16,6 @@ impl pb::echo_server::Echo for EchoServer { let message = request.into_inner().message; Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } } #[tokio::main] diff --git a/examples/src/dynamic_load_balance/client.rs b/examples/src/dynamic_load_balance/client.rs index 4c8a547..45a524b 100644 --- a/examples/src/dynamic_load_balance/client.rs +++ b/examples/src/dynamic_load_balance/client.rs @@ -1,5 +1,5 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use pb::{echo_client::EchoClient, EchoRequest}; diff --git a/examples/src/dynamic_load_balance/server.rs b/examples/src/dynamic_load_balance/server.rs index aa12406..7935e1c 100644 --- a/examples/src/dynamic_load_balance/server.rs +++ b/examples/src/dynamic_load_balance/server.rs @@ -1,17 +1,14 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } -use futures::Stream; use std::net::SocketAddr; -use std::pin::Pin; use tokio::sync::mpsc; -use tonic::{transport::Server, Request, Response, Status, Streaming}; +use tonic::{transport::Server, Request, Response, Status}; use pb::{EchoRequest, EchoResponse}; type EchoResult = Result, Status>; -type ResponseStream = Pin> + Send>>; #[derive(Debug)] pub struct EchoServer { @@ -25,31 +22,6 @@ impl pb::echo_server::Echo for EchoServer { Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } } #[tokio::main] diff --git a/examples/src/hyper_warp_multiplex/client.rs b/examples/src/hyper_warp_multiplex/client.rs index 62faa21..a2b94a1 100644 --- a/examples/src/hyper_warp_multiplex/client.rs +++ b/examples/src/hyper_warp_multiplex/client.rs @@ -8,7 +8,7 @@ pub mod hello_world { } pub mod echo { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use echo::{echo_client::EchoClient, EchoRequest}; diff --git a/examples/src/hyper_warp_multiplex/server.rs b/examples/src/hyper_warp_multiplex/server.rs index b31f5e8..1e7e426 100644 --- a/examples/src/hyper_warp_multiplex/server.rs +++ b/examples/src/hyper_warp_multiplex/server.rs @@ -4,7 +4,6 @@ //! `curl localhost:50051/hello` use futures::future::{self, Either, TryFutureExt}; -use futures::Stream; use http::version::Version; use hyper::{service::make_service_fn, Server}; use std::convert::Infallible; @@ -23,7 +22,7 @@ pub mod hello_world { } pub mod echo { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use hello_world::{ greeter_server::{Greeter, GreeterServer}, @@ -35,8 +34,6 @@ use echo::{ EchoRequest, EchoResponse, }; -type ResponseStream = Pin> + Send>>; - #[derive(Default)] pub struct MyGreeter {} @@ -65,31 +62,6 @@ impl Echo for MyEcho { let message = request.into_inner().message; Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } } #[tokio::main] diff --git a/examples/src/load_balance/client.rs b/examples/src/load_balance/client.rs index eac0b5f..8bb2806 100644 --- a/examples/src/load_balance/client.rs +++ b/examples/src/load_balance/client.rs @@ -1,5 +1,5 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use pb::{echo_client::EchoClient, EchoRequest}; diff --git a/examples/src/load_balance/server.rs b/examples/src/load_balance/server.rs index aa12406..7935e1c 100644 --- a/examples/src/load_balance/server.rs +++ b/examples/src/load_balance/server.rs @@ -1,17 +1,14 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } -use futures::Stream; use std::net::SocketAddr; -use std::pin::Pin; use tokio::sync::mpsc; -use tonic::{transport::Server, Request, Response, Status, Streaming}; +use tonic::{transport::Server, Request, Response, Status}; use pb::{EchoRequest, EchoResponse}; type EchoResult = Result, Status>; -type ResponseStream = Pin> + Send>>; #[derive(Debug)] pub struct EchoServer { @@ -25,31 +22,6 @@ impl pb::echo_server::Echo for EchoServer { Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } } #[tokio::main] diff --git a/examples/src/multiplex/client.rs b/examples/src/multiplex/client.rs index b799036..c6b25ca 100644 --- a/examples/src/multiplex/client.rs +++ b/examples/src/multiplex/client.rs @@ -3,7 +3,7 @@ pub mod hello_world { } pub mod echo { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use echo::{echo_client::EchoClient, EchoRequest}; diff --git a/examples/src/multiplex/server.rs b/examples/src/multiplex/server.rs index 1422fb0..9b148c8 100644 --- a/examples/src/multiplex/server.rs +++ b/examples/src/multiplex/server.rs @@ -1,5 +1,3 @@ -use futures::Stream; -use std::pin::Pin; use tonic::{transport::Server, Request, Response, Status}; pub mod hello_world { @@ -7,7 +5,7 @@ pub mod hello_world { } pub mod echo { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use hello_world::{ @@ -20,8 +18,6 @@ use echo::{ EchoRequest, EchoResponse, }; -type ResponseStream = Pin> + Send>>; - #[tokio::main] async fn main() -> Result<(), Box> { let addr = "[::1]:50051".parse().unwrap(); @@ -66,29 +62,4 @@ impl Echo for MyEcho { let message = request.into_inner().message; Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } } diff --git a/examples/src/tls/client.rs b/examples/src/tls/client.rs index 451f41d..b240001 100644 --- a/examples/src/tls/client.rs +++ b/examples/src/tls/client.rs @@ -1,5 +1,5 @@ pub mod pb { - tonic::include_proto!("/grpc.examples.echo"); + tonic::include_proto!("/grpc.examples.unaryecho"); } use pb::{echo_client::EchoClient, EchoRequest}; diff --git a/examples/src/tls/client_rustls.rs b/examples/src/tls/client_rustls.rs index ba0e0e4..4abb34c 100644 --- a/examples/src/tls/client_rustls.rs +++ b/examples/src/tls/client_rustls.rs @@ -2,7 +2,7 @@ //! provide a custom `ClientConfig` for the tls configuration. pub mod pb { - tonic::include_proto!("/grpc.examples.echo"); + tonic::include_proto!("/grpc.examples.unaryecho"); } use hyper::{client::HttpConnector, Uri}; diff --git a/examples/src/tls/server.rs b/examples/src/tls/server.rs index 53e3e9b..f5f0243 100644 --- a/examples/src/tls/server.rs +++ b/examples/src/tls/server.rs @@ -1,20 +1,17 @@ pub mod pb { - tonic::include_proto!("/grpc.examples.echo"); + tonic::include_proto!("/grpc.examples.unaryecho"); } -use futures::Stream; use pb::{EchoRequest, EchoResponse}; -use std::pin::Pin; use tonic::{ transport::{ server::{TcpConnectInfo, TlsConnectInfo}, Identity, Server, ServerTlsConfig, }, - Request, Response, Status, Streaming, + Request, Response, Status, }; type EchoResult = Result, Status>; -type ResponseStream = Pin> + Send>>; #[derive(Default)] pub struct EchoServer; @@ -35,31 +32,6 @@ impl pb::echo_server::Echo for EchoServer { let message = request.into_inner().message; Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } } #[tokio::main] diff --git a/examples/src/tls/server_rustls.rs b/examples/src/tls/server_rustls.rs index d8cd2b9..8985cf0 100644 --- a/examples/src/tls/server_rustls.rs +++ b/examples/src/tls/server_rustls.rs @@ -1,17 +1,16 @@ pub mod pb { - tonic::include_proto!("/grpc.examples.echo"); + tonic::include_proto!("/grpc.examples.unaryecho"); } -use futures::Stream; use hyper::server::conn::Http; use pb::{EchoRequest, EchoResponse}; -use std::{pin::Pin, sync::Arc}; +use std::sync::Arc; use tokio::net::TcpListener; use tokio_rustls::{ rustls::{Certificate, PrivateKey, ServerConfig}, TlsAcceptor, }; -use tonic::{transport::Server, Request, Response, Status, Streaming}; +use tonic::{transport::Server, Request, Response, Status}; use tower_http::ServiceBuilderExt; #[tokio::main] @@ -98,7 +97,6 @@ struct ConnInfo { } type EchoResult = Result, Status>; -type ResponseStream = Pin> + Send>>; #[derive(Default)] pub struct EchoServer; @@ -115,29 +113,4 @@ impl pb::echo_server::Echo for EchoServer { let message = request.into_inner().message; Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> EchoResult { - Err(Status::unimplemented("not implemented")) - } } diff --git a/examples/src/tls_client_auth/client.rs b/examples/src/tls_client_auth/client.rs index 97966bf..17ac865 100644 --- a/examples/src/tls_client_auth/client.rs +++ b/examples/src/tls_client_auth/client.rs @@ -1,5 +1,5 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } use pb::{echo_client::EchoClient, EchoRequest}; diff --git a/examples/src/tls_client_auth/server.rs b/examples/src/tls_client_auth/server.rs index be36abc..db63746 100644 --- a/examples/src/tls_client_auth/server.rs +++ b/examples/src/tls_client_auth/server.rs @@ -1,15 +1,12 @@ pub mod pb { - tonic::include_proto!("grpc.examples.echo"); + tonic::include_proto!("grpc.examples.unaryecho"); } -use futures::Stream; use pb::{EchoRequest, EchoResponse}; -use std::pin::Pin; use tonic::transport::{Certificate, Identity, Server, ServerTlsConfig}; use tonic::{Request, Response, Status}; type EchoResult = Result, Status>; -type ResponseStream = Pin> + Send>>; #[derive(Default)] pub struct EchoServer; @@ -26,31 +23,6 @@ impl pb::echo_server::Echo for EchoServer { let message = request.into_inner().message; Ok(Response::new(EchoResponse { message })) } - - type ServerStreamingEchoStream = ResponseStream; - - async fn server_streaming_echo( - &self, - _: Request, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } - - async fn client_streaming_echo( - &self, - _: Request>, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } - - type BidirectionalStreamingEchoStream = ResponseStream; - - async fn bidirectional_streaming_echo( - &self, - _: Request>, - ) -> Result, Status> { - Err(Status::unimplemented("Not yet implemented")) - } } #[tokio::main]