Update dependencies.

alsuren · Jan 20, 2022 · 0404dbb · 0404dbb
1 parent 8a90cc8
commit 0404dbb
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 19 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/homie-controller/Cargo.toml b/homie-controller/Cargo.toml
@@ -11,16 +11,16 @@ categories = ["network-programming"]
 
 [dependencies]
 log = "0.4.14"
-rumqttc = "0.8.0"
+rumqttc = "0.10.0"
 thiserror = "1.0.29"
 
 [dev-dependencies]
 async-channel = "1.6.1"
 futures = "0.3.17"
 homie-device = { version = "0.6.0", path = "../homie-device" }
 pretty_env_logger = "0.4.0"
-rumqttd = "0.7.0"
-rumqttlog = "0.7.0"
+rumqttd = "0.9.0"
+rumqttlog = "0.9.0"
 # TODO: Remove "io-util" once a new version of rumqttc is released which fixes
 # https://github.com/bytebeamio/rumqtt/issues/294.
 tokio = { version = "1.12.0", features = ["io-util", "macros", "rt", "rt-multi-thread", "time"] }
diff --git a/homie-controller/examples/discover.rs b/homie-controller/examples/discover.rs
@@ -2,13 +2,14 @@
 
 use homie_controller::{Event, HomieController, PollError};
 use rumqttc::MqttOptions;
+use std::time::Duration;
 
 #[tokio::main]
 async fn main() -> Result<(), PollError> {
     pretty_env_logger::init();
 
     let mut mqttoptions = MqttOptions::new("homie_controller", "test.mosquitto.org", 1883);
-    mqttoptions.set_keep_alive(5);
+    mqttoptions.set_keep_alive(Duration::from_secs(5));
 
     let (controller, mut event_loop) = HomieController::new(mqttoptions, "homie");
     loop {

diff --git a/homie-controller/tests/integration.rs b/homie-controller/tests/integration.rs
@@ -217,8 +217,7 @@ fn spawn_mqtt_broker(port: u16) {
                 max_payload_size: 2048,
                 max_inflight_count: 500,
                 max_inflight_size: 1024,
-                username: None,
-                password: None,
+                login_credentials: None,
             },
         },
     );

diff --git a/homie-device/Cargo.toml b/homie-device/Cargo.toml
@@ -15,7 +15,7 @@ futures = "0.3.17"
 local_ipaddress = "0.1.3"
 log = "0.4.14"
 mac_address = "1.1.2"
-rumqttc = "0.8.0"
+rumqttc = "0.10.0"
 tokio = "1.12.0"
 thiserror = "1.0.29"
 

diff --git a/homie-influx/Cargo.toml b/homie-influx/Cargo.toml
@@ -17,7 +17,7 @@ homie-controller = { version = "0.4.0", path = "../homie-controller" }
 influx_db_client = { version = "0.5.0", default-features = false, features = ["rustls-tls"] }
 log = "0.4.14"
 pretty_env_logger = "0.4.0"
-rumqttc = "0.8.0"
+rumqttc = "0.10.0"
 rustls = "0.19.1"
 rustls-native-certs = "0.5.0"
 serde_derive = "1.0.130"

diff --git a/homie-influx/src/config.rs b/homie-influx/src/config.rs
@@ -18,6 +18,7 @@ const DEFAULT_MQTT_RECONNECT_INTERVAL: Duration = Duration::from_secs(5);
 const DEFAULT_INFLUXDB_URL: &str = "http://localhost:8086";
 const CONFIG_FILENAME: &str = "homie-influx.toml";
 const DEFAULT_MAPPINGS_FILENAME: &str = "mappings.toml";
+const KEEP_ALIVE: Duration = Duration::from_secs(5);
 
 #[derive(Clone, Debug, Default, Deserialize)]
 #[serde(default, deny_unknown_fields)]
@@ -170,7 +171,7 @@ pub fn get_mqtt_options(
 ) -> MqttOptions {
     let client_name = format!("{}-{}", config.client_prefix, client_name_suffix);
     let mut mqtt_options = MqttOptions::new(client_name, &config.host, config.port);
-    mqtt_options.set_keep_alive(5);
+    mqtt_options.set_keep_alive(KEEP_ALIVE);
 
     if let (Some(username), Some(password)) = (&config.username, &config.password) {
         mqtt_options.set_credentials(username, password);

diff --git a/mijia-homie/Cargo.toml b/mijia-homie/Cargo.toml
@@ -34,7 +34,7 @@ itertools = "0.10.1"
 log = "0.4.14"
 mijia = { version = "0.5.0", path = "../mijia" }
 pretty_env_logger = "0.4.0"
-rumqttc = "0.8.0"
+rumqttc = "0.10.0"
 rustls = "0.19.1"
 rustls-native-certs = "0.5.0"
 serde_derive = "1.0.130"

diff --git a/mijia-homie/src/config.rs b/mijia-homie/src/config.rs
@@ -16,6 +16,7 @@ const DEFAULT_HOST: &str = "test.mosquitto.org";
 const DEFAULT_PORT: u16 = 1883;
 const DEFAULT_SENSOR_NAMES_FILENAME: &str = "sensor-names.toml";
 const CONFIG_FILENAME: &str = "mijia-homie.toml";
+const KEEP_ALIVE: Duration = Duration::from_secs(5);
 
 #[derive(Clone, Debug, Default, Deserialize)]
 #[serde(default, deny_unknown_fields)]
@@ -99,7 +100,7 @@ pub fn get_mqtt_options(config: MqttConfig, device_id: &str) -> MqttOptions {
 
     let mut mqtt_options = MqttOptions::new(client_name, config.host, config.port);
 
-    mqtt_options.set_keep_alive(5);
+    mqtt_options.set_keep_alive(KEEP_ALIVE);
     if let (Some(username), Some(password)) = (config.username, config.password) {
         mqtt_options.set_credentials(username, password);
     }