Merge pull request #71 from rainshowerLabs/0.3.3

0.3.3: better error handling

Author: makemake-kbo

src/health/safe_block.rs

@@ -225,14 +225,21 @@ pub async fn subscribe_to_new_heads(
             }
             Ok(None) => {
                 // Handle the case where the channel is closed
+                log_err!("newHeads channel closed.");
                 panic!("FATAL: Channel closed in newHeads subscription.");
             }
             Err(_) => {
                 // Handle the timeout case
                 {
                     let mut nn_rwlock = cache_args.named_numbers.write().unwrap();
                     nn_rwlock.latest = 0;
-                    incoming_tx.send(WsconnMessage::Reconnect()).unwrap();
+                    match incoming_tx.send(WsconnMessage::Reconnect()) {
+                        Ok(_) => {},
+                        Err(_) => {
+                            log_err!("WS incoming channel closed.");
+                            panic!("FATAL: WS module failed trying to reinitialize! Please restart Blutgang!");
+                        },
+                    }
                 }
                 log_wrn!("Timeout in newHeads subscription, possible connection failiure or missed block.");
                 let node_id = match sub_data.get_node_from_id(&subscription_id) {

src/rpc/types.rs

@@ -160,7 +160,7 @@ impl Rpc {
         });
 
         let number: Value =
-            unsafe { simd_json::serde::from_str(&mut self.send_request(request).await?).unwrap() };
+            unsafe { simd_json::serde::from_str(&mut self.send_request(request).await?)? };
         let number = &number["result"]["number"];
 
         let number = match number.as_str() {

src/websocket/client.rs

@@ -197,8 +197,10 @@ pub async fn ws_conn(
                     let rax = match unsafe { from_str(&mut ws_message) } {
                         Ok(rax) => rax,
                         Err(_e) => {
-                            #[cfg(feature = "debug-verbose")]
-                            log_wrn!("Couldn't deserialize ws_conn response: {}", _e);
+                            #[cfg(feature = "debug-verbose")] {
+                                use crate::log_wrn;
+                                log_wrn!("Couldn't deserialize ws_conn response: {}", _e);
+                            }
 
                             continue;
                         }