From 9451920c522f4c67ebc385fa54b2f27853629b11 Mon Sep 17 00:00:00 2001
From: Joscha <joscha@plugh.de>
Date: Thu, 3 Mar 2022 00:33:02 +0100
Subject: [PATCH] Make constructors error less

---
 cove-core/src/conn.rs     | 4 ++--
 cove-server/src/main.rs   | 2 +-
 cove-tui/src/cove/conn.rs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cove-core/src/conn.rs b/cove-core/src/conn.rs
index 13bc989..32eb544 100644
--- a/cove-core/src/conn.rs
+++ b/cove-core/src/conn.rs
@@ -160,7 +160,7 @@ impl ConnMaintenance {
     }
 }
 
-pub fn new(stream: WsStream, ping_delay: Duration) -> Result<(ConnTx, ConnRx, ConnMaintenance)> {
+pub fn new(stream: WsStream, ping_delay: Duration) -> (ConnTx, ConnRx, ConnMaintenance) {
     let (ws_tx, ws_rx) = stream.split();
     let (tx, rx) = mpsc::unbounded_channel();
     let last_ping_payload = Arc::new(Mutex::new(vec![]));
@@ -178,5 +178,5 @@ pub fn new(stream: WsStream, ping_delay: Duration) -> Result<(ConnTx, ConnRx, Co
         last_ping_payload,
     };
 
-    Ok((conn_tx, conn_rx, conn_maintenance))
+    (conn_tx, conn_rx, conn_maintenance)
 }
diff --git a/cove-server/src/main.rs b/cove-server/src/main.rs
index 770ebfb..9931733 100644
--- a/cove-server/src/main.rs
+++ b/cove-server/src/main.rs
@@ -346,7 +346,7 @@ impl Server {
     async fn handle_conn(&self, stream: TcpStream) -> anyhow::Result<()> {
         let stream = MaybeTlsStream::Plain(stream);
         let stream = tokio_tungstenite::accept_async(stream).await?;
-        let (tx, rx, maintenance) = conn::new(stream, Duration::from_secs(10))?;
+        let (tx, rx, maintenance) = conn::new(stream, Duration::from_secs(10));
         tokio::try_join!(self.greet_and_run(tx, rx), Self::maintain(maintenance))?;
         Ok(())
     }
diff --git a/cove-tui/src/cove/conn.rs b/cove-tui/src/cove/conn.rs
index 7b5a690..72eb1a0 100644
--- a/cove-tui/src/cove/conn.rs
+++ b/cove-tui/src/cove/conn.rs
@@ -257,7 +257,7 @@ impl CoveConnMt {
         timeout: Duration,
     ) -> Result<(ConnTx, ConnRx, ConnMaintenance), conn::Error> {
         let stream = tokio_tungstenite::connect_async(url).await?.0;
-        let conn = conn::new(stream, timeout)?;
+        let conn = conn::new(stream, timeout);
         Ok(conn)
     }