Skip to content

Update get_header call sites #584

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
DeepCogNeural wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update get_header call sites #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions integration-tests/lib/mining_device/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ impl SetupConnectionHandler {
info!("Setup connection sent to {}", address);

let mut incoming: StdFrame = receiver.recv().await.unwrap().try_into().unwrap();
let message_type = incoming.get_header().unwrap().msg_type();
let message_type = incoming.get_header().msg_type();
let payload = incoming.payload();
Self::handle_message_common(self_, message_type, payload).unwrap();
}
Expand Down Expand Up @@ -388,7 +388,7 @@ impl Device {

loop {
let mut incoming: StdFrame = receiver.recv().await.unwrap().try_into().unwrap();
let message_type = incoming.get_header().unwrap().msg_type();
let message_type = incoming.get_header().msg_type();
let payload = incoming.payload();
Device::handle_message_mining(self_mutex.clone(), message_type, payload).unwrap();
let mut notify_changes_to_mining_thread = self_mutex
Expand Down
53 changes: 25 additions & 28 deletions integration-tests/lib/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -291,39 +291,36 @@ pub fn message_from_frame_with_tlvs(
) -> (MsgType, AnyMessage<'static>, Option<Vec<Tlv>>) {
match frame {
Frame::Sv2(frame) => {
if let Some(header) = frame.get_header() {
let payload = frame.payload();

// Try to parse with TLV support if extensions are negotiated
if !negotiated_extensions.is_empty() {
match parse_message_frame_with_tlvs(header, payload, negotiated_extensions) {
Ok((message, tlv_fields)) => {
let message = into_static(message);
return (header.msg_type(), message, tlv_fields);
}
Err(e) => {
println!("Failed to parse frame with TLVs: {e:?}, falling back to standard parsing");
}
}
}
let header = frame.get_header();
let payload = frame.payload();

// Fallback to standard parsing without TLV support
let mut payload = frame.payload().to_vec();
let message: Result<AnyMessage<'_>, _> =
(header, payload.as_mut_slice()).try_into();
match message {
Ok(message) => {
// Try to parse with TLV support if extensions are negotiated
if !negotiated_extensions.is_empty() {
match parse_message_frame_with_tlvs(header, payload, negotiated_extensions) {
Ok((message, tlv_fields)) => {
let message = into_static(message);
(header.msg_type(), message, None)
return (header.msg_type(), message, tlv_fields);
}
_ => {
println!("Received frame with invalid payload or message type: {frame:?}");
panic!();
Err(e) => {
println!(
"Failed to parse frame with TLVs: {e:?}, falling back to standard parsing"
);
}
}
} else {
println!("Received frame with invalid header: {frame:?}");
panic!();
}

// Fallback to standard parsing without TLV support
let mut payload = frame.payload().to_vec();
let message: Result<AnyMessage<'_>, _> = (header, payload.as_mut_slice()).try_into();
match message {
Ok(message) => {
let message = into_static(message);
(header.msg_type(), message, None)
}
_ => {
println!("Received frame with invalid payload or message type: {frame:?}");
panic!();
}
}
}
Frame::HandShake(f) => {
Expand Down
6 changes: 1 addition & 5 deletions miner-apps/jd-client/src/lib/channel_manager/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use stratum_apps::{
server::{group::GroupChannel, jobs::factory::JobFactory, standard::StandardChannel},
Vardiff, VardiffState,
},
framing_sv2,
handlers_sv2::{
HandleExtensionsFromServerAsync, HandleJobDeclarationMessagesFromServerAsync,
HandleMiningMessagesFromClientAsync, HandleMiningMessagesFromServerAsync,
Expand Down Expand Up @@ -866,10 +865,7 @@ impl ChannelManager {
.recv()
.await
.map_err(JDCError::fallback)?;
let header = sv2_frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
JDCError::fallback(framing_sv2::Error::MissingHeader)
})?;
let header = sv2_frame.get_header();
let message_type = header.msg_type();
let extension_type = header.ext_type();
let payload = sv2_frame.payload();
Expand Down
6 changes: 2 additions & 4 deletions miner-apps/jd-client/src/lib/downstream/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ impl Downstream {
.recv()
.await
.map_err(|error| JDCError::disconnect(error, self.downstream_id))?;
let header = frame.get_header().expect("frame header must be present");
let header = frame.get_header();
if header.msg_type() == MESSAGE_TYPE_SETUP_CONNECTION {
self.handle_common_message_frame_from_client(None, header, frame.payload())
.await?;
Expand Down Expand Up @@ -376,9 +376,7 @@ impl Downstream {
.recv()
.await
.map_err(|error| JDCError::disconnect(error, self.downstream_id))?;
let header = sv2_frame
.get_header()
.expect("frame header must be present");
let header = sv2_frame.get_header();
let payload = sv2_frame.payload();
let negotiated_extensions = self
.downstream_data
Expand Down
11 changes: 2 additions & 9 deletions miner-apps/jd-client/src/lib/job_declarator/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use stratum_apps::{
fallback_coordinator::FallbackCoordinator,
network_helpers::{connect_with_noise, resolve_host, TCP_CONNECT_TIMEOUT},
stratum_core::{
framing_sv2,
handlers_sv2::HandleCommonMessagesFromServerAsync,
parsers_sv2::{AnyMessage, JobDeclaration},
},
Expand Down Expand Up @@ -298,10 +297,7 @@ impl JobDeclarator {
JDCError::fallback(JDCErrorKind::ChannelErrorSender)
})?;

let header = incoming.get_header().ok_or_else(|| {
error!("Handshake frame missing header.");
JDCError::fallback(framing_sv2::Error::MissingHeader)
})?;
let header = incoming.get_header();

debug!(ext_type = ?header.ext_type(),
msg_type = ?header.msg_type(),
Expand Down Expand Up @@ -351,10 +347,7 @@ impl JobDeclarator {
.map_err(JDCError::fallback)?;

debug!("Received SV2 frame from JDS.");
let header = sv2_frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
JDCError::fallback(framing_sv2::Error::MissingHeader)
})?;
let header = sv2_frame.get_header();
let message_type = header.msg_type();
let extension_type = header.ext_type();

Expand Down
11 changes: 2 additions & 9 deletions miner-apps/jd-client/src/lib/template_receiver/sv2_tp/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use stratum_apps::{
key_utils::Secp256k1PublicKey,
network_helpers::{self, connect_with_noise, resolve_host_port, TCP_CONNECT_TIMEOUT},
stratum_core::{
framing_sv2,
handlers_sv2::HandleCommonMessagesFromServerAsync,
noise_sv2,
parsers_sv2::{AnyMessage, TemplateDistribution},
Expand Down Expand Up @@ -304,10 +303,7 @@ impl Sv2Tp {
.map_err(JDCError::shutdown)?;

debug!("Received SV2 frame from Template provider.");
let header = sv2_frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
JDCError::shutdown(framing_sv2::Error::MissingHeader)
})?;
let header = sv2_frame.get_header();
let message_type = header.msg_type();
let extension_type = header.ext_type();

Expand Down Expand Up @@ -391,10 +387,7 @@ impl Sv2Tp {
JDCError::shutdown(noise_sv2::Error::ExpectedIncomingHandshakeMessage)
})?;

let header = incoming.get_header().ok_or_else(|| {
error!("Handshake frame missing header");
JDCError::shutdown(framing_sv2::Error::MissingHeader)
})?;
let header = incoming.get_header();
debug!(ext_type = ?header.ext_type(),
msg_type = ?header.msg_type(),
"Received upstream handshake response");
Expand Down
12 changes: 3 additions & 9 deletions miner-apps/jd-client/src/lib/upstream/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use stratum_apps::{
fallback_coordinator::FallbackCoordinator,
network_helpers::{connect_with_noise, resolve_host, TCP_CONNECT_TIMEOUT},
stratum_core::{
binary_sv2::Seq064K, extensions_sv2::RequestExtensions, framing_sv2,
binary_sv2::Seq064K, extensions_sv2::RequestExtensions,
handlers_sv2::HandleCommonMessagesFromServerAsync, parsers_sv2::AnyMessage,
},
task_manager::TaskManager,
Expand Down Expand Up @@ -242,10 +242,7 @@ impl Upstream {
let mut incoming: Sv2Frame = incoming_frame;
debug!(?incoming, "Decoded inbound handshake frame");

let header = incoming.get_header().ok_or_else(|| {
error!("Handshake frame missing header");
JDCError::fallback(framing_sv2::Error::MissingHeader)
})?;
let header = incoming.get_header();

info!(ext_type = ?header.ext_type(), msg_type = ?header.msg_type(), "Dispatching inbound handshake message");
self.handle_common_message_frame_from_server(None, header, incoming.payload())
Expand Down Expand Up @@ -407,10 +404,7 @@ impl Upstream {
.recv()
.await
.map_err(JDCError::fallback)?;
let header = sv2_frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
JDCError::fallback(framing_sv2::Error::MissingHeader)
})?;
let header = sv2_frame.get_header();
let message_type = header.msg_type();
let extension_type = header.ext_type();

Expand Down
5 changes: 1 addition & 4 deletions miner-apps/translator/src/lib/sv2/channel_manager/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,7 @@ impl ChannelManager {
.map_err(TproxyError::fallback)?;

let mut channel_manager: ChannelManager = (*self).clone();
let header = sv2_frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
TproxyError::fallback(framing_sv2::Error::MissingHeader)
})?;
let header = sv2_frame.get_header();
match protocol_message_type(header.ext_type(), header.msg_type()) {
MessageType::Mining => {
channel_manager
Expand Down
11 changes: 2 additions & 9 deletions miner-apps/translator/src/lib/sv2/upstream/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -357,10 +357,7 @@ impl Upstream {
}
};

let header = incoming.get_header().ok_or_else(|| {
error!("Expected handshake frame but no header found.");
TproxyError::fallback(TproxyErrorKind::UnexpectedMessage(0, 0))
})?;
let header = incoming.get_header();

let payload = incoming.payload();

Expand Down Expand Up @@ -408,11 +405,7 @@ impl Upstream {
.map_err(TproxyError::fallback)?;

debug!("Upstream: received frame.");
let Some(header) = sv2_frame.get_header() else {
return Err(TproxyError::fallback(TproxyErrorKind::UnexpectedMessage(
0, 0,
)));
};
let header = sv2_frame.get_header();

match protocol_message_type(header.ext_type(), header.msg_type()) {
MessageType::Common => {
Expand Down
11 changes: 2 additions & 9 deletions pool-apps/jd-server/src/lib/job_declarator/downstream/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use stratum_apps::{
network_helpers::noise_stream::NoiseTcpStream,
stratum_core::{
common_messages_sv2::MESSAGE_TYPE_SETUP_CONNECTION,
framing_sv2,
handlers_sv2::HandleCommonMessagesFromClientAsync,
job_declaration_sv2::DeclareMiningJob,
parsers_sv2::{parse_message_frame_with_tlvs, AnyMessage},
Expand Down Expand Up @@ -278,10 +277,7 @@ impl Downstream {
.await
.map_err(|e| error::JDSError::disconnect(e, self.downstream_id))?;

let header = frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
error::JDSError::disconnect(framing_sv2::Error::MissingHeader, self.downstream_id)
})?;
let header = frame.get_header();

if header.msg_type() == MESSAGE_TYPE_SETUP_CONNECTION {
self.handle_common_message_frame_from_client(
Expand Down Expand Up @@ -341,10 +337,7 @@ impl Downstream {
.recv()
.await
.map_err(|e| error::JDSError::disconnect(e, self.downstream_id))?;
let header = sv2_frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
error::JDSError::disconnect(framing_sv2::Error::MissingHeader, self.downstream_id)
})?;
let header = sv2_frame.get_header();

match protocol_message_type(header.ext_type(), header.msg_type()) {
MessageType::JobDeclaration => {
Expand Down
17 changes: 2 additions & 15 deletions pool-apps/pool/src/lib/downstream/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use stratum_apps::{
extended::ExtendedChannel, group::GroupChannel, standard::StandardChannel,
},
common_messages_sv2::MESSAGE_TYPE_SETUP_CONNECTION,
framing_sv2,
handlers_sv2::{HandleCommonMessagesFromClientAsync, HandleExtensionsFromClientAsync},
parsers_sv2::{parse_message_frame_with_tlvs, AnyMessage, Mining, Tlv},
},
Expand Down Expand Up @@ -265,13 +264,7 @@ impl Downstream {
.recv()
.await
.map_err(|error| PoolError::disconnect(error, self.downstream_id))?;
let Some(header) = frame.get_header() else {
error!("SV2 frame missing header");
return Err(PoolError::disconnect(
framing_sv2::Error::MissingHeader,
self.downstream_id,
));
};
let header = frame.get_header();
// The first ever message received on a new downstream connection
// should always be a setup connection message.
if header.msg_type() == MESSAGE_TYPE_SETUP_CONNECTION {
Expand Down Expand Up @@ -331,13 +324,7 @@ impl Downstream {
.recv()
.await
.map_err(|error| PoolError::disconnect(error, self.downstream_id))?;
let Some(header) = sv2_frame.get_header() else {
error!("SV2 frame missing header");
return Err(PoolError::disconnect(
framing_sv2::Error::MissingHeader,
self.downstream_id,
));
};
let header = sv2_frame.get_header();

match protocol_message_type(header.ext_type(), header.msg_type()) {
MessageType::Mining => {
Expand Down
11 changes: 2 additions & 9 deletions pool-apps/pool/src/lib/template_receiver/sv2_tp/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use stratum_apps::{
key_utils::Secp256k1PublicKey,
network_helpers::{self, connect_with_noise, resolve_host_port, TCP_CONNECT_TIMEOUT},
stratum_core::{
framing_sv2,
handlers_sv2::HandleCommonMessagesFromServerAsync,
parsers_sv2::{AnyMessage, TemplateDistribution},
},
Expand Down Expand Up @@ -253,10 +252,7 @@ impl Sv2Tp {
.await
.map_err(PoolError::shutdown)?;
debug!("Received SV2 frame from Template provider.");
let header = sv2_frame.get_header().ok_or_else(|| {
error!("SV2 frame missing header");
PoolError::shutdown(framing_sv2::Error::MissingHeader)
})?;
let header = sv2_frame.get_header();

match protocol_message_type(header.ext_type(), header.msg_type()) {
MessageType::Common => {
Expand Down Expand Up @@ -346,10 +342,7 @@ impl Sv2Tp {
PoolError::shutdown(e)
})?;

let header = incoming.get_header().ok_or_else(|| {
error!("Handshake frame missing header");
PoolError::shutdown(framing_sv2::Error::MissingHeader)
})?;
let header = incoming.get_header();
debug!(
ext_type = ?header.ext_type(),
msg_type = ?header.msg_type(),
Expand Down