remove ConnectionRefused from ConnectionError because StateError alre…

…ady has a similar thing
bytebeamio · Dec 14, 2022 · edd7ba4 · edd7ba4
1 parent e04652c
commit edd7ba4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/rumqttc/src/eventloop.rs b/rumqttc/src/eventloop.rs
@@ -43,8 +43,6 @@ pub enum ConnectionError {
     Tls(#[from] tls::Error),
     #[error("I/O: {0}")]
     Io(#[from] io::Error),
-    #[error("Connection refused, return code: {0:?}")]
-    ConnectionRefused(ConnectReturnCode),
     #[error("Expected ConnAck packet, received: {0:?}")]
     NotConnAck(Packet),
     #[error("Requests done")]
@@ -308,7 +306,9 @@ async fn mqtt_connect(
         Incoming::ConnAck(connack) if connack.code == ConnectReturnCode::Success => {
             Ok(Packet::ConnAck(connack))
         }
-        Incoming::ConnAck(connack) => Err(ConnectionError::ConnectionRefused(connack.code)),
+        Incoming::ConnAck(connack) => Err(ConnectionError::MqttState(StateError::Connect(
+            connack.code,
+        ))),
         packet => Err(ConnectionError::NotConnAck(packet)),
     }
 }

diff --git a/rumqttc/src/v5/eventloop.rs b/rumqttc/src/v5/eventloop.rs
@@ -44,8 +44,6 @@ pub enum ConnectionError {
     Tls(#[from] tls::Error),
     #[error("I/O: {0}")]
     Io(#[from] io::Error),
-    #[error("Connection refused, return code: {0:?}")]
-    ConnectionRefused(ConnectReturnCode),
     #[error("Expected ConnAck packet, received: {0:?}")]
     NotConnAck(Box<Packet>),
     #[error("Requests done")]
@@ -305,7 +303,9 @@ async fn mqtt_connect(
         Incoming::ConnAck(connack) if connack.code == ConnectReturnCode::Success => {
             Ok(Packet::ConnAck(connack))
         }
-        Incoming::ConnAck(connack) => Err(ConnectionError::ConnectionRefused(connack.code)),
+        Incoming::ConnAck(connack) => Err(ConnectionError::MqttState(StateError::Connect(
+            connack.code,
+        ))),
         packet => Err(ConnectionError::NotConnAck(Box::new(packet))),
     }
 }

diff --git a/rumqttc/tests/reliability.rs b/rumqttc/tests/reliability.rs
@@ -422,7 +422,9 @@ async fn next_poll_after_connect_failure_reconnects() {
     let mut eventloop = EventLoop::new(options, 5);
 
     match eventloop.poll().await {
-        Err(ConnectionError::ConnectionRefused(ConnectReturnCode::BadUserNamePassword)) => (),
+        Err(ConnectionError::MqttState(StateError::Connect(
+            ConnectReturnCode::BadUserNamePassword,
+        ))) => (),
         v => panic!("Expected bad username password error. Found = {:?}", v),
     }