refactor: roll out connect

bytebeamio · May 29, 2024 · 8e1633f · 8e1633f
1 parent a1282cd
commit 8e1633f
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 24 deletions.
diff --git a/rumqttc/src/v5/eventloop.rs b/rumqttc/src/v5/eventloop.rs
@@ -130,7 +130,7 @@ impl EventLoop {
 
         requests_in_channel.retain(|request| {
             match request {
-                Request::PubAck(_) => false,  // Wait for publish retransmission, else the broker could be confused by an unexpected ack
+                Request::PubAck(_) => false, // Wait for publish retransmission, else the broker could be confused by an unexpected ack
                 _ => true,
             }
         });
@@ -398,20 +398,20 @@ async fn mqtt_connect(
     options: &mut MqttOptions,
     network: &mut Network,
 ) -> Result<ConnAck, ConnectionError> {
-    let keep_alive = options.keep_alive().as_secs() as u16;
-    let clean_start = options.clean_start();
-    let client_id = options.client_id();
-    let properties = options.connect_properties();
-
     let connect = Connect {
-        keep_alive,
-        client_id,
-        clean_start,
-        properties,
+        client_id: options.client_id(),
+        keep_alive: options.keep_alive().as_secs() as u16,
+        clean_start: options.clean_start(),
+        properties: options.connect_properties(),
     };
+    let last_will = options.last_will();
+    let login = options.credentials();
 
     // send mqtt connect packet
-    network.connect(connect, options).await?;
+    network
+        .write(Packet::Connect(connect, last_will, login))
+        .await?;
+    network.flush().await?;
 
     // validate connack
     match network.read().await? {

diff --git a/rumqttc/src/v5/framed.rs b/rumqttc/src/v5/framed.rs
@@ -86,19 +86,6 @@ impl Network {
             .map_err(StateError::Deserialization)
     }
 
-    pub async fn connect(
-        &mut self,
-        connect: Connect,
-        options: &MqttOptions,
-    ) -> Result<(), StateError> {
-        let last_will = options.last_will();
-        let login = options.credentials();
-        self.write(Packet::Connect(connect, last_will, login))
-            .await?;
-
-        self.flush().await
-    }
-
     pub async fn flush(&mut self) -> Result<(), StateError> {
         self.framed
             .flush()