Merge pull request #776 from plebhash/no-downstreams-connected

stratum-mining · Mar 12, 2024 · 361f12b · 361f12b
2 parents 55fe7d4 + d7b1dc2
commit 361f12b
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/roles/pool/src/lib/mining_pool/setup_connection.rs b/roles/pool/src/lib/mining_pool/setup_connection.rs
@@ -72,7 +72,7 @@ impl SetupConnectionHandler {
         )?;
 
         let message = response.into_message().ok_or(PoolError::RolesLogic(
-            roles_logic_sv2::Error::UnexpectedMessage(message_type),
+            roles_logic_sv2::Error::NoDownstreamsConnected,
         ))?;
 
         let sv2_frame: StdFrame = PoolMessages::Common(message.clone()).try_into()?;

diff --git a/roles/pool/src/lib/status.rs b/roles/pool/src/lib/status.rs
@@ -82,13 +82,22 @@ async fn send_status(
                 .unwrap_or(());
             }
         },
-        Sender::DownstreamListener(tx) => {
-            tx.send(Status {
-                state: State::DownstreamShutdown(e),
-            })
-            .await
-            .unwrap_or(());
-        }
+        Sender::DownstreamListener(tx) => match e {
+            PoolError::RolesLogic(roles_logic_sv2::Error::NoDownstreamsConnected) => {
+                tx.send(Status {
+                    state: State::Healthy("No Downstreams Connected".to_string()),
+                })
+                .await
+                .unwrap_or(());
+            }
+            _ => {
+                tx.send(Status {
+                    state: State::DownstreamShutdown(e),
+                })
+                .await
+                .unwrap_or(());
+            }
+        },
         Sender::Upstream(tx) => {
             tx.send(Status {
                 state: State::TemplateProviderShutdown(e),
@@ -101,6 +110,7 @@ async fn send_status(
 }
 
 // this is called by `error_handling::handle_result!`
+// todo: as described in issue #777, we should replace every generic *(_) with specific errors and cover every possible combination
 pub async fn handle_error(sender: &Sender, e: PoolError) -> error_handling::ErrorBranch {
     tracing::debug!("Error: {:?}", &e);
     match e {
@@ -117,6 +127,9 @@ pub async fn handle_error(sender: &Sender, e: PoolError) -> error_handling::Erro
         PoolError::BinarySv2(_) => send_status(sender, e, error_handling::ErrorBranch::Break).await,
         PoolError::Codec(_) => send_status(sender, e, error_handling::ErrorBranch::Break).await,
         PoolError::Noise(_) => send_status(sender, e, error_handling::ErrorBranch::Continue).await,
+        PoolError::RolesLogic(roles_logic_sv2::Error::NoDownstreamsConnected) => {
+            send_status(sender, e, error_handling::ErrorBranch::Continue).await
+        }
         PoolError::RolesLogic(_) => {
             send_status(sender, e, error_handling::ErrorBranch::Break).await
         }