rename JN/negotiation/negotiator to JD/declaration/declarator

xraid · May 20, 2023 · 952f442 · 952f442
1 parent 6de50d9
commit 952f442
Show file tree

Hide file tree

Showing 63 changed files with 350 additions and 272 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ members = [
     "protocols/v2/subprotocols/common-messages",
     "protocols/v2/subprotocols/template-distribution",
     "protocols/v2/subprotocols/mining",
-    "protocols/v2/subprotocols/job-negotiation",
+    "protocols/v2/subprotocols/job-declaration",
     "protocols/v2/sv2-ffi",
     "protocols/v2/roles-logic-sv2",
     "roles/mining-proxy",

diff --git a/README.md b/README.md
@@ -125,7 +125,7 @@ stratum
   │       └─ roles-logic-sv2
   │       └─ subprotocols
   │       │   └─ common-messages
-  │       │   └─ job-negotiation
+  │       │   └─ job-declaration
   │       │   └─ mining
   │       │   └─ template-distribution
   │       └─ sv2-ffi
@@ -252,7 +252,7 @@ For a noise decoder, it returns a `Sv2Frame`, which can be composed of several `
 
 ### 3.08 protocols/v2/subprotocols
 
-`subprotocols` has four crates (`common-messages`, `job-negotiation`, `mining`, and
+`subprotocols` has four crates (`common-messages`, `job-declaration`, `mining`, and
 `template-distribution`) which are the Rust translation of the messages defined by each Sv2
 (sub)protocol. They all have the same internal/external dependencies.
 
@@ -324,7 +324,7 @@ The user is required to use a safe `Mutex` defined in `messages_sv2::utils::Mute
 - `subprotocols/common_messages_sv2`
 - `subprotocols/mining_sv2`
 - `subprotocols/template_distribution_sv2`
-- `subprotocols/job_negotiation_sv2`
+- `subprotocols/job_declaration_sv2`
 
 ### 3.12 utils/buffer
 

diff --git a/RELEASE.md b/RELEASE.md
@@ -28,7 +28,7 @@ Due to either github dependencies or a crate failing the build stage during publ
 - [] codec_sv2 - noise dependency
 - [] template_distribution_sv2 - build failure
 - [] mining_sv2 - publishes after template_distribution_sv2
-- [] job-negotiation_sv2 - publishes after template_distribution_sv2
+- [] job-declaration_sv2 - publishes after template_distribution_sv2
 - [] roles_logic_sv2 - publishes after template_distribution_sv2
 - [] network_helpers - publishes after template_distribution_sv2
 - [] error_handling - had to exclude to bypass rate limit but will probably publish now

diff --git a/protocols/fuzz-tests/Cargo.lock b/protocols/fuzz-tests/Cargo.lock
diff --git a/protocols/v2/const-sv2/src/lib.rs b/protocols/v2/const-sv2/src/lib.rs
@@ -34,7 +34,7 @@ pub const MESSAGE_TYPE_REQUEST_TRANSACTION_DATA: u8 = 0x73;
 pub const MESSAGE_TYPE_REQUEST_TRANSACTION_DATA_SUCCESS: u8 = 0x74;
 pub const MESSAGE_TYPE_REQUEST_TRANSACTION_DATA_ERROR: u8 = 0x75;
 pub const MESSAGE_TYPE_SUBMIT_SOLUTION: u8 = 0x76;
-// JOB NEGOTIATION PROTOCOL MESSAGES TYPES
+// JOB DECLARATION PROTOCOL MESSAGES TYPES
 pub const MESSAGE_TYPE_ALLOCATE_MINING_TOKEN: u8 = 0x50;
 pub const MESSAGE_TYPE_ALLOCATE_MINING_TOKEN_SUCCESS: u8 = 0x51;
 pub const MESSAGE_TYPE_COMMIT_MINING_JOB: u8 = 0x57;
@@ -81,7 +81,7 @@ pub const CHANNEL_BIT_REQUEST_TRANSACTION_DATA: bool = false;
 pub const CHANNEL_BIT_REQUEST_TRANSACTION_DATA_SUCCESS: bool = false;
 pub const CHANNEL_BIT_REQUEST_TRANSACTION_DATA_ERROR: bool = false;
 pub const CHANNEL_BIT_SUBMIT_SOLUTION: bool = false;
-// JOB NEGOTIATION PROTOCOL MESSAGES CHANNEL BIT
+// JOB DECLARATION PROTOCOL MESSAGES CHANNEL BIT
 pub const CHANNEL_BIT_ALLOCATE_MINING_TOKEN: bool = false;
 pub const CHANNEL_BIT_ALLOCATE_MINING_TOKEN_SUCCESS: bool = false;
 pub const CHANNEL_BIT_COMMIT_MINING_JOB: bool = false;

diff --git a/protocols/v2/roles-logic-sv2/Cargo.toml b/protocols/v2/roles-logic-sv2/Cargo.toml
@@ -14,11 +14,12 @@ binary_sv2 = {version = "^0.1.6", path = "../../../protocols/v2/binary-sv2/binar
 common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages", version = "^0.1.5" }
 mining_sv2 = { path = "../../../protocols/v2/subprotocols/mining", version = "^0.1.0" }
 template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution", version = "^0.1.5" }
-job_negotiation_sv2 = { path = "../../../protocols/v2/subprotocols/job-negotiation", version = "^0.1.0" }
+job_declaration_sv2 = { path = "../../../protocols/v2/subprotocols/job-declaration", version = "^0.1.0" }
 const_sv2 = { version = "^0.1.2", path = "../../../protocols/v2/const-sv2"}
 framing_sv2 = { version = "^0.1.5", path = "../../../protocols/v2/framing-sv2" }
 bitcoin = "0.27.1"
 tracing = { version = "0.1"}
+chacha20poly1305 = { version = "0.10.1"}
 
 [dev-dependencies]
 quickcheck = "1.0.3"
@@ -31,7 +32,7 @@ with_serde = [ "serde",
 "binary_sv2/with_serde",
 "common_messages_sv2/with_serde",
 "template_distribution_sv2/with_serde",
-"job_negotiation_sv2/with_serde",
+"job_declaration_sv2/with_serde",
 "mining_sv2/with_serde"]
 prop_test = ["template_distribution_sv2/prop_test"]
 # Code coverage tools may conflict with the nopanic logic, so we can disable it when needed