SupportedChannelTypes moved back to mining handlers

Author: GitGab19

protocols/v2/roles-logic-sv2/src/handlers/mining.rs

@@ -44,7 +44,7 @@ use crate::{
     selectors::DownstreamMiningSelector,
 };
 
-use super::{SendTo_, SupportedChannelTypes};
+use super::SendTo_;
 
 use crate::utils::Mutex;
 use const_sv2::*;
@@ -54,6 +54,16 @@ use tracing::{debug, error, info, trace};
 /// see [`SendTo_`]
 pub type SendTo<Remote> = SendTo_<Mining<'static>, Remote>;
 
+/// Represents supported channel types in a mining connection.
+#[derive(Debug, Copy, Clone, PartialEq, Eq)]
+pub enum SupportedChannelTypes {
+    Standard,
+    Extended,
+    Group,
+    /// Represents a connection that supports both group and extended channels.
+    GroupAndExtended,
+}
+
 /// Trait for parsing downstream mining messages in a Stratum V2 connection.
 ///
 /// This trait defines methods for parsing and routing downstream messages

protocols/v2/roles-logic-sv2/src/handlers/mod.rs

@@ -83,13 +83,3 @@ impl<SubProtocol, Remote> SendTo_<SubProtocol, Remote> {
         }
     }
 }
-
-/// Represents supported channel types in a mining connection.
-#[derive(Debug, Copy, Clone, PartialEq, Eq)]
-pub enum SupportedChannelTypes {
-    Standard,
-    Extended,
-    Group,
-    /// Represents a connection that supports both group and extended channels.
-    GroupAndExtended,
-}

roles/jd-client/src/lib/downstream.rs

@@ -13,8 +13,7 @@ use roles_logic_sv2::{
     errors::Error,
     handlers::{
         common::{ParseCommonMessagesFromDownstream, SendTo as SendToCommon},
-        mining::{ParseMiningMessagesFromDownstream, SendTo},
-        SupportedChannelTypes,
+        mining::{ParseMiningMessagesFromDownstream, SendTo, SupportedChannelTypes},
     },
     job_creator::JobsCreators,
     mining_sv2::*,

roles/jd-client/src/lib/upstream_sv2/upstream.rs

@@ -36,7 +36,8 @@ use tokio::{net::TcpStream, task, task::AbortHandle};
 use tracing::{error, info, warn};
 
 use roles_logic_sv2::{
-    common_messages_sv2::Reconnect, handlers::SupportedChannelTypes, mining_sv2::SetGroupChannel,
+    common_messages_sv2::Reconnect, handlers::mining::SupportedChannelTypes,
+    mining_sv2::SetGroupChannel,
 };
 use std::collections::VecDeque;
 

roles/mining-proxy/src/lib/downstream_mining.rs

@@ -13,8 +13,7 @@ use roles_logic_sv2::{
     errors::Error,
     handlers::{
         common::{ParseCommonMessagesFromDownstream, SendTo as SendToCommon},
-        mining::{ParseMiningMessagesFromDownstream, SendTo},
-        SupportedChannelTypes,
+        mining::{ParseMiningMessagesFromDownstream, SendTo, SupportedChannelTypes},
     },
     mining_sv2::*,
     parsers::{AnyMessage, Mining, MiningDeviceMessages},

roles/mining-proxy/src/lib/upstream_mining.rs

@@ -25,10 +25,7 @@ use roles_logic_sv2::{
         IsMiningDownstream, IsMiningUpstream, IsUpstream, RequestIdMapper, UpstreamChannel,
     },
     errors::Error,
-    handlers::{
-        mining::{ParseMiningMessagesFromUpstream, SendTo},
-        SupportedChannelTypes,
-    },
+    handlers::mining::{ParseMiningMessagesFromUpstream, SendTo, SupportedChannelTypes},
     job_dispatcher::GroupChannelJobDispatcher,
     mining_sv2::*,
     parsers::{AnyMessage, CommonMessages, Mining, MiningDeviceMessages},

roles/pool/src/lib/mining_pool/message_handler.rs

@@ -2,10 +2,7 @@ use super::super::mining_pool::Downstream;
 use binary_sv2::Str0255;
 use roles_logic_sv2::{
     errors::Error,
-    handlers::{
-        mining::{ParseMiningMessagesFromDownstream, SendTo},
-        SupportedChannelTypes,
-    },
+    handlers::mining::{ParseMiningMessagesFromDownstream, SendTo, SupportedChannelTypes},
     mining_sv2::*,
     parsers::Mining,
     routing_logic::NoRouting,

roles/test-utils/mining-device/src/lib/mod.rs

@@ -12,8 +12,7 @@ use roles_logic_sv2::{
     errors::Error,
     handlers::{
         common::ParseCommonMessagesFromUpstream,
-        mining::{ParseMiningMessagesFromUpstream, SendTo},
-        SupportedChannelTypes,
+        mining::{ParseMiningMessagesFromUpstream, SendTo, SupportedChannelTypes},
     },
     mining_sv2::*,
     parsers::{Mining, MiningDeviceMessages},

roles/translator/src/lib/upstream_sv2/upstream.rs

@@ -44,7 +44,8 @@ use tokio::{
 use tracing::{error, info, warn};
 
 use roles_logic_sv2::{
-    common_messages_sv2::Reconnect, handlers::SupportedChannelTypes, mining_sv2::SetGroupChannel,
+    common_messages_sv2::Reconnect, handlers::mining::SupportedChannelTypes,
+    mining_sv2::SetGroupChannel,
 };
 use stratum_common::bitcoin::BlockHash;