Basic default client

tonic-examples/src/helloworld/client.rs

@@ -1,7 +1,4 @@
-use hyper::client::conn::Builder;
-use hyper::client::connect::HttpConnector;
-use hyper::client::service::{Connect, MakeService};
-use tonic::service::add_origin::AddOrigin;
+use tonic::transport::Client;
 
 pub mod hello_world {
     include!(concat!(env!("OUT_DIR"), "/helloworld.rs"));
@@ -12,12 +9,7 @@ pub mod hello_world {
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let origin = http::Uri::from_static("http://[::1]:50051");
 
-    let settings = Builder::new().http2_only(true).clone();
-    let mut maker = Connect::new(HttpConnector::new(), settings);
-
-    let svc = maker.make_service(origin.clone()).await?;
-
-    let svc = AddOrigin::new(svc, origin);
+    let svc = Client::connect(origin).await?;
 
     let mut client = hello_world::GreeterClient::new(svc);
 

tonic-examples/src/helloworld/server.rs

@@ -1,6 +1,4 @@
 use hyper::Server;
-use std::time::Duration;
-use tokio::timer::Delay;
 use tonic::{Request, Response, Status};
 
 pub mod hello_world {

tonic-examples/src/routeguide/client.rs

@@ -5,8 +5,7 @@ use hyper::client::service::{Connect, MakeService};
 use route_guide::{Point, RouteNote};
 use std::time::{Duration, Instant};
 use tokio::timer::Interval;
-use tonic::service::add_origin::AddOrigin;
-use tonic::Request;
+use tonic::{Request, transport::Client};
 
 mod route_guide {
     include!(concat!(env!("OUT_DIR"), "/routeguide.rs"));
@@ -17,12 +16,7 @@ mod route_guide {
 async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let origin = http::Uri::from_static("http://[::1]:10000");
 
-    let settings = Builder::new().http2_only(true).clone();
-    let mut maker = Connect::new(HttpConnector::new(), settings);
-
-    let svc = maker.make_service(origin.clone()).await?;
-    let svc = AddOrigin::new(svc, origin);
-
+    let svc = Client::connect(origin).await?;
     let mut client = route_guide::RouteGuideClient::new(svc);
 
     let start = Instant::now();