Merge pull request stratum-mining#1072 from Shourya742/remove-job-dis…

…tribution-protocol Remove job distribution protocol
xyephy · Jul 30, 2024 · d495151 · d495151
2 parents dcaa92d + ddad29f
commit d495151
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/protocols/v2/const-sv2/src/lib.rs b/protocols/v2/const-sv2/src/lib.rs
@@ -39,9 +39,8 @@ pub const NOISE_HASHED_PROTOCOL_NAME_CHACHA: [u8; 32] = [
 pub const NOISE_SUPPORTED_CIPHERS_MESSAGE: [u8; 5] = [1, 0x47, 0x53, 0x45, 0x41];
 
 pub const SV2_MINING_PROTOCOL_DISCRIMINANT: u8 = 0;
-pub const SV2_JOB_NEG_PROTOCOL_DISCRIMINANT: u8 = 1;
+pub const SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT: u8 = 1;
 pub const SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT: u8 = 2;
-pub const SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT: u8 = 3;
 
 // COMMON MESSAGES TYPES
 pub const MESSAGE_TYPE_SETUP_CONNECTION: u8 = 0x0;

diff --git a/protocols/v2/subprotocols/common-messages/src/setup_connection.rs b/protocols/v2/subprotocols/common-messages/src/setup_connection.rs
@@ -7,8 +7,8 @@ use binary_sv2::{
 };
 use binary_sv2::{Deserialize, GetSize, Serialize, Str0255};
 use const_sv2::{
- SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT, SV2_JOB_NEG_PROTOCOL_DISCRIMINANT,
- SV2_MINING_PROTOCOL_DISCRIMINANT, SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT,
+ SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT, SV2_MINING_PROTOCOL_DISCRIMINANT,
+ SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT,
 };
 use core::convert::TryFrom;
 #[cfg(not(feature = "with_serde"))]
@@ -119,7 +119,7 @@ impl<'decoder> SetupConnection<'decoder> {
  (false, false) => true,
  }
  }
- Protocol::TemplateDistributionProtocol | Protocol::JobDistributionProtocol => {
+ Protocol::TemplateDistributionProtocol => {
  // These protocols do not define flags for setting up a connection.
  false
  }
@@ -320,18 +320,16 @@ impl<'a> From<SetupConnectionError<'a>> for CSetupConnectionError {
 }
 
 /// MiningProtocol = [`SV2_MINING_PROTOCOL_DISCRIMINANT`],
-/// JobDeclarationProtocol = [`SV2_JOB_NEG_PROTOCOL_DISCRIMINANT`],
+/// JobDeclarationProtocol = [`SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT`],
 /// TemplateDistributionProtocol = [`SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT`],
-/// JobDistributionProtocol = [`SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT`],
 #[cfg_attr(feature = "with_serde", derive(Serialize_repr, Deserialize_repr))]
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
 #[repr(u8)]
 #[allow(clippy::enum_variant_names)]
 pub enum Protocol {
  MiningProtocol = SV2_MINING_PROTOCOL_DISCRIMINANT,
- JobDeclarationProtocol = SV2_JOB_NEG_PROTOCOL_DISCRIMINANT,
+ JobDeclarationProtocol = SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT,
  TemplateDistributionProtocol = SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT,
- JobDistributionProtocol = SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT,
 }
 
 #[cfg(not(feature = "with_serde"))]
@@ -366,9 +364,8 @@ impl TryFrom<u8> for Protocol {
  fn try_from(value: u8) -> Result<Self, Self::Error> {
  match value {
  SV2_MINING_PROTOCOL_DISCRIMINANT => Ok(Protocol::MiningProtocol),
- SV2_JOB_NEG_PROTOCOL_DISCRIMINANT => Ok(Protocol::JobDeclarationProtocol),
+ SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT => Ok(Protocol::JobDeclarationProtocol),
  SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT => Ok(Protocol::TemplateDistributionProtocol),
- SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT => Ok(Protocol::JobDistributionProtocol),
  _ => Err(()),
  }
  }
@@ -385,9 +382,8 @@ impl From<Protocol> for u8 {
  fn from(val: Protocol) -> Self {
  match val {
  Protocol::MiningProtocol => SV2_MINING_PROTOCOL_DISCRIMINANT,
- Protocol::JobDeclarationProtocol => SV2_JOB_NEG_PROTOCOL_DISCRIMINANT,
+ Protocol::JobDeclarationProtocol => SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT,
  Protocol::TemplateDistributionProtocol => SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT,
- Protocol::JobDistributionProtocol => SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT,
  }
  }
 }

diff --git a/protocols/v2/sv2-ffi/sv2.h b/protocols/v2/sv2-ffi/sv2.h
@@ -38,12 +38,10 @@ static const uintptr_t INITIATOR_EXPECTED_HANDSHAKE_MESSAGE_SIZE = ((ELLSWIFT_EN
 
 static const uint8_t SV2_MINING_PROTOCOL_DISCRIMINANT = 0;
 
-static const uint8_t SV2_JOB_NEG_PROTOCOL_DISCRIMINANT = 1;
+static const uint8_t SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT = 1;
 
 static const uint8_t SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT = 2;
 
-static const uint8_t SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT = 3;
-
 static const uint8_t MESSAGE_TYPE_SETUP_CONNECTION = 0;
 
 static const uint8_t MESSAGE_TYPE_SETUP_CONNECTION_SUCCESS = 1;
@@ -271,14 +269,12 @@ void _c_export_cvec2(CVec2 _a);
 #include <new>
 
 /// MiningProtocol = [`SV2_MINING_PROTOCOL_DISCRIMINANT`],
-/// JobDeclarationProtocol = [`SV2_JOB_NEG_PROTOCOL_DISCRIMINANT`],
+/// JobDeclarationProtocol = [`SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT`],
 /// TemplateDistributionProtocol = [`SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT`],
-/// JobDistributionProtocol = [`SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT`],
 enum class Protocol : uint8_t {
  MiningProtocol = SV2_MINING_PROTOCOL_DISCRIMINANT,
- JobDeclarationProtocol = SV2_JOB_NEG_PROTOCOL_DISCRIMINANT,
+ JobDeclarationProtocol = SV2_JOB_DECLARATION_PROTOCOL_DISCRIMINANT,
  TemplateDistributionProtocol = SV2_TEMPLATE_DISTR_PROTOCOL_DISCRIMINANT,
- JobDistributionProtocol = SV2_JOB_DISTR_PROTOCOL_DISCRIMINANT,
 };
 
 /// ## ChannelEndpointChanged (Server -> Client)

diff --git a/scripts/build_header.sh b/scripts/build_header.sh
@@ -1,9 +1,8 @@
 #! /bin/sh
-
 cargo install --version 0.20.0 cbindgen
 
-rm -f ./scripts/sv2.h
-touch ./scripts/sv2.h
+rm -f ./sv2.h
+touch ./sv2.h
 
 dir=${1:-../protocols}