fix: remove timeout argument from connect_with_config

Move timeout from connect_with_config to Config struct.

Author: kusancho

CHANGELOG.md

@@ -9,10 +9,12 @@
 - tlua::LuaTable::metatable which is a better alternative to the existing `tlua::LuaTable::get_or_create_metatable`
 - `ffi::tarantool::box_schema_version` and `ffi::tarantool::box_session_id` functions
 - `network::protocol::SyncIndex::get` method
-- `network::protocol::codec::{LegacyCall, Nop, Prepare, Begin, Commit, Rollback}` variants 
+- `network::protocol::codec::{LegacyCall, Nop, Prepare, Begin, Commit, Rollback}` variants
 - `network::protocol::codec::Header::encode_from_parts` function
 - `network::protocol::codec::iproto_key::SQL_INFO` constant
-- Added optional argument timeout to `network::client::Client::connect_with_config`
+- Added optional field `timeout` to `network::protocol::Config`.
+Used in `network::client::Client::connect_with_config` for
+restricting time for resolving address.
 - Untagged enum represention as in serde with `#[encode(untagged)]` attribute
 - `tlua::Nil` now supports (de)serialization via serde
 
@@ -111,7 +113,7 @@
 - `tarantool::set_error!` macro will now use the caller's location, so if it's
   called from a function marked `#[track_caller]`, the log message will contain
   that function's call site, instead of the location of the macro call itself.
-- `Decimal` type is now backed by builtin tarantool decimal implementation. 
+- `Decimal` type is now backed by builtin tarantool decimal implementation.
   The only expected difference is slight change in formatting (lack of
   scientific notation).
 - datetime `from_ffi_dt` and `as_ffi_dt` functions now public

tarantool/src/network/client/mod.rs

@@ -183,7 +183,7 @@ impl Client {
     /// # Errors
     /// Error is returned if an attempt to connect failed.
     pub async fn connect(url: &str, port: u16) -> Result<Self, ClientError> {
-        Self::connect_with_config(url, port, Default::default(), None).await
+        Self::connect_with_config(url, port, Default::default()).await
     }
 
     /// Creates a new client and tries to establish connection
@@ -199,9 +199,8 @@ impl Client {
         url: &str,
         port: u16,
         config: protocol::Config,
-        timeout: Option<Duration>,
     ) -> Result<Self, ClientError> {
-        let timeout = timeout.unwrap_or(Duration::MAX);
+        let timeout = config.timeout.unwrap_or(Duration::MAX);
         let stream = TcpStream::connect_timeout(url, port, timeout)
             .map_err(|e| ClientError::ConnectionClosed(Arc::new(e.into())))?;
         let client = ClientInner::new(config, stream.clone());
@@ -481,7 +480,6 @@ mod tests {
                 creds: Some(("test_user".into(), "password".into())),
                 ..Default::default()
             },
-            None,
         )
         .timeout(Duration::from_secs(3))
         .await
@@ -494,8 +492,10 @@ mod tests {
         let client = Client::connect_with_config(
             "123123", // Invalid host
             listen_port(),
-            protocol::Config::default(),
-            Some(Duration::from_secs(1)),
+            protocol::Config {
+                timeout: Some(Duration::from_secs(1)),
+                ..Default::default()
+            },
         );
         let res = client.await.unwrap_err();
         if cfg!(target_os = "macos") {
@@ -764,7 +764,6 @@ mod tests {
                     auth_method: AuthMethod::Md5,
                     ..Default::default()
                 },
-                None,
             )
             .timeout(Duration::from_secs(3))
             .await
@@ -788,7 +787,6 @@ mod tests {
                     auth_method: AuthMethod::Md5,
                     ..Default::default()
                 },
-                None,
             )
             .timeout(Duration::from_secs(3))
             .await
@@ -811,7 +809,6 @@ mod tests {
                     auth_method: AuthMethod::ChapSha1,
                     ..Default::default()
                 },
-                None,
             )
             .timeout(Duration::from_secs(3))
             .await
@@ -862,7 +859,6 @@ mod tests {
                     auth_method: AuthMethod::Ldap,
                     ..Default::default()
                 },
-                None,
             )
             .timeout(Duration::from_secs(3))
             .await
@@ -886,7 +882,6 @@ mod tests {
                     auth_method: AuthMethod::Ldap,
                     ..Default::default()
                 },
-                None,
             )
             .timeout(Duration::from_secs(3))
             .await
@@ -909,7 +904,6 @@ mod tests {
                     auth_method: AuthMethod::ChapSha1,
                     ..Default::default()
                 },
-                None,
             )
             .timeout(Duration::from_secs(3))
             .await

tarantool/src/network/client/reconnect.rs

@@ -52,13 +52,9 @@ impl Client {
             self.reconnect_count.fetch_add(1, Ordering::Relaxed);
         }
 
-        let res = super::Client::connect_with_config(
-            &self.url,
-            self.port,
-            self.protocol_config.clone(),
-            None,
-        )
-        .await;
+        let res =
+            super::Client::connect_with_config(&self.url, self.port, self.protocol_config.clone())
+                .await;
         match res {
             Ok(new_client) => {
                 *client = Some(Ok(new_client.clone()));

tarantool/src/network/protocol/mod.rs

@@ -16,6 +16,7 @@ use crate::error;
 use crate::error::TarantoolError;
 use std::collections::HashMap;
 use std::io::{Cursor, Read, Seek};
+use std::time::Duration;
 
 #[deprecated = "use `ProtocolError` instead"]
 pub type Error = ProtocolError;
@@ -78,6 +79,7 @@ pub struct Config {
     pub creds: Option<(String, String)>,
     /// Authentication method. Only useful in picodata.
     pub auth_method: AuthMethod,
+    pub timeout: Option<Duration>,
     // TODO: add buffer limits here
 }