propagate tx handler errors, change shutdown handler to reporter

Author: redsh4de

binaries/cuprated/src/p2p/request_handler.rs

@@ -178,7 +178,7 @@ where
             fut.await.map_err(|e| match e {
                 HandlerError::Peer(e) => e,
                 HandlerError::Service(e) => {
-                    shutdown_handle.handle_service_error(&e, ());
+                    shutdown_handle.report_service_error(&e);
                     e
                 }
             })

binaries/cuprated/src/rpc/handlers/json_rpc.rs

@@ -246,7 +246,7 @@ async fn submit_block(
     .await
     {
         if matches!(&e, IncomingBlockError::Service(_)) {
-            state.shutdown_handle.handle_service_error(&e, ());
+            state.shutdown_handle.report_service_error(&e);
         }
         return Err(e.into());
     }

binaries/cuprated/src/rpc/service/tx_handler.rs

@@ -17,7 +17,10 @@ pub async fn handle_incoming_txs(
 ) -> Result<TxRelayChecks, Error> {
     let resp = match tx_handler.ready().await {
         Ok(r) => r.call(incoming_txs).await,
-        Err(e) => return Ok(shutdown_handle.handle_service_error(e, TxRelayChecks::empty())),
+        Err(e) => {
+            shutdown_handle.report_service_error(&e);
+            return Err(e.into());
+        }
     };
 
     Ok(match resp {
@@ -67,7 +70,8 @@ pub async fn handle_incoming_txs(
             }
             IncomingTxError::DuplicateTransaction => TxRelayChecks::DOUBLE_SPEND,
             IncomingTxError::Internal(e) => {
-                return Ok(shutdown_handle.handle_service_error(e, TxRelayChecks::empty()));
+                shutdown_handle.report_service_error(&e);
+                return Err(e);
             }
         },
     })

binaries/cuprated/src/supervisor.rs

@@ -40,10 +40,9 @@ impl ShutdownHandle {
         self.trigger_shutdown();
     }
 
-    /// Handle a service error by triggering a fatal shutdown.
-    pub fn handle_service_error<T>(&self, error: impl std::fmt::Display, default: T) -> T {
+    /// Report a service error and trigger a shutdown.
+    pub fn report_service_error(&self, error: impl std::fmt::Display) {
         self.fatal(&error);
-        default
     }
 }