From 2e471548d89be98d26b2332d059a24a3fc15ec23 Mon Sep 17 00:00:00 2001 From: Nisheeth Barthwal Date: Wed, 20 Oct 2021 16:47:17 +0200 Subject: [PATCH] fix(tonic): change `connect_lazy` to be infallible (#712) Co-authored-by: Lucio Franco --- CHANGELOG.md | 1 - tests/integration_tests/tests/connection.rs | 4 +--- tonic/src/transport/channel/endpoint.rs | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ad45de1f1..3b2a0b48b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -57,7 +57,6 @@ This release includes a new crate `tonic-web` which is versioned at `0.1` and su * **transport:** provide generic access to connect info ([#647](https://github.com/hyperium/tonic/issues/647)) ([e5e3118](https://github.com/hyperium/tonic/commit/e5e311853bff347355722bc829d40f54e8954aee)) - # [0.4.3](https://github.com/hyperium/tonic/compare/v0.4.2...v0.4.3) (2021-04-29) ### Features diff --git a/tests/integration_tests/tests/connection.rs b/tests/integration_tests/tests/connection.rs index c345a35d9..f27ef09d1 100644 --- a/tests/integration_tests/tests/connection.rs +++ b/tests/integration_tests/tests/connection.rs @@ -63,9 +63,7 @@ async fn connect_lazy_reconnects_after_first_failure() { let sender = Arc::new(Mutex::new(Some(tx))); let svc = test_server::TestServer::new(Svc(sender)); - let channel = Endpoint::from_static("http://127.0.0.1:1339") - .connect_lazy() - .unwrap(); + let channel = Endpoint::from_static("http://127.0.0.1:1339").connect_lazy(); let mut client = TestClient::new(channel); diff --git a/tonic/src/transport/channel/endpoint.rs b/tonic/src/transport/channel/endpoint.rs index bc777502d..e0a4965f3 100644 --- a/tonic/src/transport/channel/endpoint.rs +++ b/tonic/src/transport/channel/endpoint.rs @@ -284,7 +284,7 @@ impl Endpoint { /// /// The channel returned by this method does not attempt to connect to the endpoint until first /// use. - pub fn connect_lazy(&self) -> Result { + pub fn connect_lazy(&self) -> Channel { let mut http = hyper::client::connect::HttpConnector::new(); http.enforce_http(false); http.set_nodelay(self.tcp_nodelay); @@ -299,9 +299,9 @@ impl Endpoint { if let Some(connect_timeout) = self.connect_timeout { let mut connector = hyper_timeout::TimeoutConnector::new(connector); connector.set_connect_timeout(Some(connect_timeout)); - Ok(Channel::new(connector, self.clone())) + Channel::new(connector, self.clone()) } else { - Ok(Channel::new(connector, self.clone())) + Channel::new(connector, self.clone()) } }