move binary_sv2 crate code up..

there's no point in having two directories named binary_sv2 anymore
stratum-mining · Feb 7, 2025 · 9511a53 · 9511a53
1 parent 93bef4a
commit 9511a53
Show file tree

Hide file tree

Showing 32 changed files with 31 additions and 31 deletions.
diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -46,7 +46,7 @@ jobs:
 
       - name: Rust Docs crate binary_sv2
         run: |
-          cd protocols/v2/binary-sv2/binary-sv2
+          cd protocols/v2/binary-sv2
           cargo doc --features core,with_buffer_pool
 
       - name: Rust Docs crate const_sv2

diff --git a/.github/workflows/release-libs.yaml b/.github/workflows/release-libs.yaml
@@ -47,7 +47,7 @@ jobs:
 
       - name: Publish crate binary_sv2
         run: |
-          ./scripts/release-libs.sh protocols/v2/binary-sv2/binary-sv2
+          ./scripts/release-libs.sh protocols/v2/binary-sv2
 
       - name: Publish crate const_sv2
         run: |

diff --git a/.github/workflows/semver-check.yaml b/.github/workflows/semver-check.yaml
@@ -53,8 +53,8 @@ jobs:
         working-directory: protocols/v2/binary-sv2/codec
         run: cargo semver-checks
 
-      - name: Run semver checks for protocols/v2/binary-sv2/binary-sv2
-        working-directory: protocols/v2/binary-sv2/binary-sv2
+      - name: Run semver checks for protocols/v2/binary-sv2
+        working-directory: protocols/v2/binary-sv2
         run: cargo semver-checks
 
       - name: Run semver checks for protocols/v2/const-sv2

diff --git a/benches/Cargo.toml b/benches/Cargo.toml
@@ -18,7 +18,7 @@ num-bigint = "0.4.3"
 num-traits = "0.2.15"
 bitcoin="0.28.1"
 codec_sv2 = { path = "../protocols/v2/codec-sv2", features=["noise_sv2"] }
-binary_sv2 = { path = "../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../protocols/v2/binary-sv2" }
 network_helpers_sv2 = { path = "../roles/roles-utils/network-helpers" }
 rand = "0.8.4"
 

diff --git a/examples/interop-cpp-no-cargo/rust-build-script.sh b/examples/interop-cpp-no-cargo/rust-build-script.sh
@@ -82,7 +82,7 @@ rustc \
 rustc \
         --crate-name binary_sv2 \
         --edition=2018 \
-        $ROOT/binary-sv2/binary-sv2/src/lib.rs \
+        $ROOT/binary-sv2/src/lib.rs \
         --error-format=json \
         --json=diagnostic-rendered-ansi,artifacts \
         --crate-type lib \

diff --git a/examples/interop-cpp/Cargo.toml b/examples/interop-cpp/Cargo.toml
@@ -10,6 +10,6 @@ publish = false
 [dependencies]
 codec_sv2 = { path = "../../protocols/v2/codec-sv2" }
 const_sv2 = { path = "../../protocols/v2/const-sv2" }
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 common_messages_sv2 = { path = "../../protocols/v2/subprotocols/common-messages" }
 template_distribution_sv2 = { path = "../../protocols/v2/subprotocols/template-distribution" }
diff --git a/examples/ping-pong-encrypted/Cargo.toml b/examples/ping-pong-encrypted/Cargo.toml
@@ -7,7 +7,7 @@ authors = [ "SRI Community" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = [ "noise_sv2" ] }
 noise_sv2 = { path = "../../protocols/v2/noise-sv2" }
 key-utils = { version = "^1.0.0", path = "../../utils/key-utils" }

diff --git a/examples/ping-pong/Cargo.toml b/examples/ping-pong/Cargo.toml
@@ -7,7 +7,7 @@ authors = [ "SRI Community" ]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2" }
 
 rand = "0.8"
diff --git a/protocols/Cargo.toml b/protocols/Cargo.toml
@@ -6,7 +6,7 @@ members = [
     "v1",
     "v2/binary-sv2/codec",
     "v2/binary-sv2/derive_codec",
-    "v2/binary-sv2/binary-sv2",
+    "v2/binary-sv2",
     "v2/noise-sv2",
     "v2/framing-sv2",
     "v2/codec-sv2",

diff --git a/protocols/v1/Cargo.toml b/protocols/v1/Cargo.toml
@@ -20,7 +20,7 @@ hex = "0.4.3"
 serde = { version = "1.0.89", default-features = false, features = ["derive", "alloc"] }
 serde_json = { version = "1.0.64", default-features = false, features = ["alloc"] }
 tracing = {version = "0.1"}
-binary_sv2 = { path = "../v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../v2/binary-sv2" }
 
 [dev-dependencies]
 quickcheck = "1"

diff --git a/...ocols/v2/binary-sv2/binary-sv2/Cargo.toml → protocols/v2/binary-sv2/Cargo.toml b/...ocols/v2/binary-sv2/binary-sv2/Cargo.toml → protocols/v2/binary-sv2/Cargo.toml
@@ -14,8 +14,8 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-binary_codec_sv2 = { path = "../codec", optional = true }
-derive_codec_sv2 = { path = "../derive_codec", optional = true }
+binary_codec_sv2 = { path = "codec", optional = true }
+derive_codec_sv2 = { path = "derive_codec", optional = true }
 
 [features]
 default = ["core"]

diff --git a/protocols/v2/binary-sv2/binary-sv2/README.md → protocols/v2/binary-sv2/README.md b/protocols/v2/binary-sv2/binary-sv2/README.md → protocols/v2/binary-sv2/README.md
diff --git a/...-sv2/binary-sv2/examples/encode_decode.rs → ...s/v2/binary-sv2/examples/encode_decode.rs b/...-sv2/binary-sv2/examples/encode_decode.rs → ...s/v2/binary-sv2/examples/encode_decode.rs
diff --git a/...ocols/v2/binary-sv2/binary-sv2/src/lib.rs → protocols/v2/binary-sv2/src/lib.rs b/...ocols/v2/binary-sv2/binary-sv2/src/lib.rs → protocols/v2/binary-sv2/src/lib.rs
diff --git a/protocols/v2/codec-sv2/Cargo.toml b/protocols/v2/codec-sv2/Cargo.toml
@@ -15,7 +15,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 serde = { version = "1.0.89", default-features = false, optional = true }
 framing_sv2 = { path = "../../../protocols/v2/framing-sv2" }
 noise_sv2 = { path = "../../../protocols/v2/noise-sv2", default-features = false, optional = true }
-binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../../protocols/v2/binary-sv2" }
 const_sv2 = { path = "../../../protocols/v2/const-sv2"}
 buffer_sv2 = { path = "../../../utils/buffer"}
 rand = { version = "0.8.5", default-features = false }

diff --git a/protocols/v2/framing-sv2/Cargo.toml b/protocols/v2/framing-sv2/Cargo.toml
@@ -16,7 +16,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 [dependencies]
 serde = { version = "1.0.89", default-features = false, optional = true }
 const_sv2 = { path = "../../../protocols/v2/const-sv2" }
-binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../../protocols/v2/binary-sv2" }
 buffer_sv2 = { path = "../../../utils/buffer", optional=true }
 
 [dev-dependencies]

diff --git a/protocols/v2/roles-logic-sv2/Cargo.toml b/protocols/v2/roles-logic-sv2/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 
 [dependencies]
 stratum-common = { path = "../../../common", features=["bitcoin"]}
-binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2", default-features = true }
+binary_sv2 = { path = "../../../protocols/v2/binary-sv2", default-features = true }
 common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages" }
 mining_sv2 = { path = "../../../protocols/v2/subprotocols/mining" }
 template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution" }

diff --git a/protocols/v2/subprotocols/common-messages/Cargo.toml b/protocols/v2/subprotocols/common-messages/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-binary_sv2 = { path = "../../binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../binary-sv2" }
 const_sv2 = { path = "../../const-sv2" }
 quickcheck = { version = "1.0.3", optional = true }
 quickcheck_macros = { version = "1", optional = true }

diff --git a/protocols/v2/subprotocols/job-declaration/Cargo.toml b/protocols/v2/subprotocols/job-declaration/Cargo.toml
@@ -13,5 +13,5 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 
 
 [dependencies]
-binary_sv2 = { path = "../../binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../binary-sv2" }
 const_sv2 = { path = "../../const-sv2" }
diff --git a/protocols/v2/subprotocols/mining/Cargo.toml b/protocols/v2/subprotocols/mining/Cargo.toml
@@ -15,7 +15,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-binary_sv2 = { path = "../../binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../binary-sv2" }
 const_sv2 = { path = "../../const-sv2"}
 
 [dev-dependencies]

diff --git a/protocols/v2/subprotocols/template-distribution/Cargo.toml b/protocols/v2/subprotocols/template-distribution/Cargo.toml
@@ -14,7 +14,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-binary_sv2 = { path = "../../binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../binary-sv2" }
 const_sv2 = { path = "../../const-sv2"}
 quickcheck = { version = "1.0.3", optional=true }
 quickcheck_macros = { version = "1", optional=true }

diff --git a/protocols/v2/sv2-ffi/Cargo.toml b/protocols/v2/sv2-ffi/Cargo.toml
@@ -16,7 +16,7 @@ crate-type = ["staticlib"]
 [dependencies]
 codec_sv2 = { path = "../../../protocols/v2/codec-sv2" }
 const_sv2 = { path = "../../../protocols/v2/const-sv2" }
-binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../../protocols/v2/binary-sv2" }
 common_messages_sv2 = { path = "../../../protocols/v2/subprotocols/common-messages" }
 template_distribution_sv2 = { path = "../../../protocols/v2/subprotocols/template-distribution" }
 

diff --git a/roles/jd-client/Cargo.toml b/roles/jd-client/Cargo.toml
@@ -19,7 +19,7 @@ path = "src/lib/mod.rs"
 stratum-common = { path = "../../common" }
 async-channel = "1.5.1"
 async-recursion = "0.3.2"
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 buffer_sv2 = { path = "../../utils/buffer" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = ["noise_sv2", "with_buffer_pool"] }
 framing_sv2 = { path = "../../protocols/v2/framing-sv2" }

diff --git a/roles/jd-server/Cargo.toml b/roles/jd-server/Cargo.toml
@@ -19,7 +19,7 @@ path = "src/lib/mod.rs"
 [dependencies]
 stratum-common = { version = "1.0.0", path = "../../common" }
 async-channel = "1.5.1"
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 buffer_sv2 = { path = "../../utils/buffer" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = ["noise_sv2"] }
 const_sv2 = { path = "../../protocols/v2/const-sv2" }

diff --git a/roles/mining-proxy/Cargo.toml b/roles/mining-proxy/Cargo.toml
@@ -20,7 +20,7 @@ path = "src/lib/mod.rs"
 stratum-common = { path = "../../common" }
 async-channel = "1.8.0"
 async-recursion = "0.3.2"
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 buffer_sv2 = { path = "../../utils/buffer" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = ["noise_sv2", "with_buffer_pool"] }
 const_sv2 = { path = "../../protocols/v2/const-sv2" }

diff --git a/roles/pool/Cargo.toml b/roles/pool/Cargo.toml
@@ -19,7 +19,7 @@ path = "src/lib/mod.rs"
 [dependencies]
 stratum-common = { path = "../../common" }
 async-channel = "1.5.1"
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 buffer_sv2 = { path = "../../utils/buffer" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = ["noise_sv2"] }
 const_sv2 = { path = "../../protocols/v2/const-sv2" }

diff --git a/roles/roles-utils/network-helpers/Cargo.toml b/roles/roles-utils/network-helpers/Cargo.toml
@@ -17,7 +17,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 async-std = { version = "1.8.0", optional = true }
 async-channel = { version = "1.8.0", optional = true }
 tokio = { version = "1", features = ["full"] }
-binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2", optional = true }
+binary_sv2 = { path = "../../../protocols/v2/binary-sv2", optional = true }
 codec_sv2 = { path = "../../../protocols/v2/codec-sv2", features=["noise_sv2"], optional = true }
 const_sv2 = {path = "../../../protocols/v2/const-sv2"}
 tracing = { version = "0.1" }

diff --git a/roles/test-utils/mining-device/Cargo.toml b/roles/test-utils/mining-device/Cargo.toml
@@ -25,7 +25,7 @@ codec_sv2 = { path = "../../../protocols/v2/codec-sv2", features=["noise_sv2"] }
 roles_logic_sv2 = { path = "../../../protocols/v2/roles-logic-sv2" }
 const_sv2 = { path = "../../../protocols/v2/const-sv2" }
 async-channel = "1.5.1"
-binary_sv2 = { path = "../../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../../protocols/v2/binary-sv2" }
 network_helpers_sv2 = { path = "../../roles-utils/network-helpers" }
 buffer_sv2 = { path = "../../../utils/buffer"}
 async-recursion = "0.3.2"

diff --git a/roles/tests-integration/Cargo.toml b/roles/tests-integration/Cargo.toml
@@ -13,7 +13,7 @@ keywords = ["stratum", "mining", "bitcoin", "protocol"]
 [dependencies]
 async-channel = "1.5.1"
 corepc-node = "0.5.0"
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = ["noise_sv2"] }
 const_sv2 = { path = "../../protocols/v2/const-sv2" }
 flate2 = "1.0.32"

diff --git a/roles/translator/Cargo.toml b/roles/translator/Cargo.toml
@@ -23,7 +23,7 @@ path = "src/main.rs"
 stratum-common = { path = "../../common" }
 async-channel = "1.5.1"
 async-recursion = "0.3.2"
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 buffer_sv2 = { path = "../../utils/buffer" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features = ["noise_sv2", "with_buffer_pool"] }
 framing_sv2 = { path = "../../protocols/v2/framing-sv2" }

diff --git a/scripts/coverage-protocols.sh b/scripts/coverage-protocols.sh
@@ -13,7 +13,7 @@ crates=(
   "v1"
   "v2/binary-sv2/codec"
   "v2/binary-sv2/derive_codec"
-  "v2/binary-sv2/binary-sv2"
+  "v2/binary-sv2"
   "v2/noise-sv2"
   "v2/framing-sv2"
   "v2/codec-sv2"

diff --git a/test/scale/Cargo.toml b/test/scale/Cargo.toml
@@ -14,7 +14,7 @@ serde = { version = "1.0.89", features = ["derive", "alloc"], default-features =
 async-channel = "1.5.1"
 async-std="1.8.0"
 bytes = "1.0.1"
-binary_sv2 = { path = "../../protocols/v2/binary-sv2/binary-sv2" }
+binary_sv2 = { path = "../../protocols/v2/binary-sv2" }
 codec_sv2 = { path = "../../protocols/v2/codec-sv2", features=["noise_sv2"] }
 network_helpers_sv2 = { version = "0.1", path = "../../roles/roles-utils/network-helpers" }
 roles_logic_sv2 = { path = "../../protocols/v2/roles-logic-sv2" }