remove serde-sv2 and no-serde-sv2 variants from ci and other places

stratum-mining · Feb 6, 2025 · 934abff · 934abff
1 parent d01f7ff
commit 934abff
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 39 deletions.
diff --git a/.github/workflows/coverage-protocols.yaml b/.github/workflows/coverage-protocols.yaml
@@ -44,14 +44,6 @@ jobs:
           file: ./protocols/target/tarpaulin-reports/binary-sv2-coverage/cobertura.xml
           flags: binary_sv2-coverage
           token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Upload binary_serde_sv2-coverage to codecov.io
-        uses: codecov/codecov-action@v4
-        with:
-          directory: ./protocols/target/tarpaulin-reports/serde-sv2-coverage
-          file: ./protocols/target/tarpaulin-reports/serde-sv2-coverage/cobertura.xml
-          flags: binary_serde_sv2-coverage
-          token: ${{ secrets.CODECOV_TOKEN }}
 
       - name: Upload codec_sv2-coverage to codecov.io
         uses: codecov/codecov-action@v4

diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml
@@ -34,21 +34,16 @@ jobs:
           cd utils/buffer
           cargo doc
 
-      - name: Rust Docs crate no_serde_sv2_derive_codec
+      - name: Rust Docs crate binary_sv2 derive_codec
         run: |
-          cd protocols/v2/binary-sv2/no-serde-sv2/derive_codec
+          cd protocols/v2/binary-sv2/derive_codec
           cargo doc
 
-      - name: Rust Docs crate no_serde_sv2_codec
+      - name: Rust Docs crate binary_sv2 codec
         run: |
-          cd protocols/v2/binary-sv2/no-serde-sv2/codec
+          cd protocols/v2/binary-sv2/codec
           cargo doc --features with_buffer_pool
 
-      - name: Rust Docs crate serde_sv2
-        run: |
-          cd protocols/v2/binary-sv2/serde-sv2
-          cargo doc
-
       - name: Rust Docs crate binary_sv2
         run: |
           cd protocols/v2/binary-sv2/binary-sv2

diff --git a/.github/workflows/release-libs.yaml b/.github/workflows/release-libs.yaml
@@ -37,17 +37,13 @@ jobs:
         run: |
           ./scripts/release-libs.sh utils/buffer
 
-      - name: Publish crate no_serde_sv2_derive_codec
+      - name: Publish crate binary_sv2 derive_codec
         run: |
-          ./scripts/release-libs.sh protocols/v2/binary-sv2/no-serde-sv2/derive_codec
+          ./scripts/release-libs.sh protocols/v2/binary-sv2/derive_codec
 
-      - name: Publish crate no_serde_sv2_codec
+      - name: Publish crate binary_sv2 codec
         run: |
-          ./scripts/release-libs.sh protocols/v2/binary-sv2/no-serde-sv2/codec
-
-      - name: Publish crate serde_sv2
-        run: |
-          ./scripts/release-libs.sh protocols/v2/binary-sv2/serde-sv2
+          ./scripts/release-libs.sh protocols/v2/binary-sv2/codec
 
       - name: Publish crate binary_sv2
         run: |

diff --git a/.github/workflows/semver-check.yaml b/.github/workflows/semver-check.yaml
@@ -49,12 +49,8 @@ jobs:
         working-directory: utils/buffer
         run: cargo semver-checks
 
-      - name: Run semver checks for protocols/v2/binary-sv2/no-serde-sv2/codec
-        working-directory: protocols/v2/binary-sv2/no-serde-sv2/codec
-        run: cargo semver-checks
-
-      - name: Run semver checks for protocols/v2/binary-sv2/serde-sv2
-        working-directory: protocols/v2/binary-sv2/serde-sv2
+      - name: Run semver checks for protocols/v2/binary-sv2/codec
+        working-directory: protocols/v2/binary-sv2/codec
         run: cargo semver-checks
 
       - name: Run semver checks for protocols/v2/binary-sv2/binary-sv2

diff --git a/examples/interop-cpp-no-cargo/rust-build-script.sh b/examples/interop-cpp-no-cargo/rust-build-script.sh
@@ -27,7 +27,7 @@ rustc \
 rustc \
         --crate-name binary_codec_sv2 \
         --edition=2018 \
-        $ROOT/binary-sv2/no-serde-sv2/codec/src/lib.rs \
+        $ROOT/binary-sv2/codec/src/lib.rs \
         --error-format=json \
         --json=diagnostic-rendered-ansi \
         --crate-type lib \
@@ -40,7 +40,7 @@ rustc \
 rustc \
         --crate-name binary_codec_sv2 \
         --edition=2018 \
-        $ROOT/binary-sv2/no-serde-sv2/codec/src/lib.rs \
+        $ROOT/binary-sv2/codec/src/lib.rs \
         --error-format=json \
         --json=diagnostic-rendered-ansi,artifacts \
         --crate-type lib \
@@ -66,7 +66,7 @@ rustc \
 rustc \
         --crate-name derive_codec_sv2 \
         --edition=2018 \
-        $ROOT/binary-sv2/no-serde-sv2/derive_codec/src/lib.rs \
+        $ROOT/binary-sv2/derive_codec/src/lib.rs \
         --error-format=json \
         --json=diagnostic-rendered-ansi \
         --crate-type proc-macro \

diff --git a/protocols/fuzz-tests/Cargo.toml b/protocols/fuzz-tests/Cargo.toml
@@ -17,7 +17,7 @@ cargo-fuzz = true
 libfuzzer-sys = { version = "0.4.0", features = ["arbitrary-derive"] }
 arbitrary = { version = "1", features = ["derive"] }
 rand = "0.8.3"
-binary_codec_sv2 = { path = "../v2/binary-sv2/no-serde-sv2/codec"}
+binary_codec_sv2 = { path = "../v2/binary-sv2/codec"}
 codec_sv2 = { path = "../v2/codec-sv2", features = ["noise_sv2"]}
 roles_logic_sv2 = { path = "../v2/roles-logic-sv2"}
 affinity = "0.1.1"

diff --git a/scripts/coverage-protocols.sh b/scripts/coverage-protocols.sh
@@ -11,9 +11,8 @@ tarpaulin
 
 crates=(
   "v1"
-  "v2/binary-sv2/serde-sv2"
-  "v2/binary-sv2/no-serde-sv2/codec"
-  "v2/binary-sv2/no-serde-sv2/derive_codec"
+  "v2/binary-sv2/codec"
+  "v2/binary-sv2/derive_codec"
   "v2/binary-sv2/binary-sv2"
   "v2/noise-sv2"
   "v2/framing-sv2"

diff --git a/scripts/sv2-publish.sh b/scripts/sv2-publish.sh
@@ -14,7 +14,6 @@ output=$(cargo smart-release \
     binary_sv2 \
     binary_codec_sv2 \
     derive_codec_sv2 \
-    serde_sv2 \
     codec_sv2 \
     const_sv2 \
     framing_sv2 \