move key-utils and error-handling as modules of stratum-apps

.github/workflows/coverage-utils.yaml

@@ -45,19 +45,3 @@ jobs:
           flags: buffer_sv2-coverage
 
           token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Upload error_handling-coverage to codecov.io
-        uses: codecov/codecov-action@v4
-        with:
-          directory: ./utils/target/tarpaulin-reports/error-handling-coverage
-          file: ./utils/target/tarpaulin-reports/error-handling-coverage/cobertura.xml
-          flags: error_handling-coverage
-          token: ${{ secrets.CODECOV_TOKEN }}
-
-      - name: Upload key-utils-coverage to codecov.io
-        uses: codecov/codecov-action@v4
-        with:
-          directory: ./utils/target/tarpaulin-reports/key-utils-coverage
-          file: ./utils/target/tarpaulin-reports/key-utils-coverage/cobertura.xml
-          flags: key-utils-coverage
-          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/docs.yaml

@@ -94,12 +94,6 @@ jobs:
           cd protocols/v2/subprotocols/template-distribution
           cargo doc
 
-      - name: Rust Docs crate roles_logic_sv2
-
-        run: |
-          cd protocols/v2/roles-logic-sv2
-          cargo doc
-
       - name: Rust Docs crate sv1_api
         run: |
           cd protocols/v1

.github/workflows/release-libs.yaml

@@ -34,14 +34,6 @@ jobs:
         run: |
           ./scripts/release-libs.sh utils/buffer
 
-      - name: Publish crate error-handling
-        run: |
-          ./scripts/release-libs.sh utils/error-handling
-
-      - name: Publish crate key-utils
-        run: |
-          ./scripts/release-libs.sh utils/key-utils
-
       - name: Publish crate noise_sv2
         run: |
           ./scripts/release-libs.sh protocols/v2/noise-sv2
@@ -64,7 +56,7 @@ jobs:
         run: |
           ./scripts/release-libs.sh protocols/v2/framing-sv2
 
-      # codec_sv2 (depends on framing_sv2, noise_sv2, binary_sv2, buffer_sv2, key-utils)
+      # codec_sv2 (depends on framing_sv2, noise_sv2, binary_sv2, buffer_sv2)
       - name: Publish crate codec_sv2
         run: |
           ./scripts/release-libs.sh protocols/v2/codec-sv2

.github/workflows/semver-check.yaml

@@ -81,10 +81,6 @@ jobs:
         working-directory: protocols/v2/subprotocols/template-distribution
         run: cargo semver-checks
 
-      - name: Run semver checks for protocols/v2/roles-logic-sv2
-        working-directory: protocols/v2/roles-logic-sv2
-        run: cargo semver-checks --default-features
-
       - name: Run semver checks for protocols/v2/channels-sv2
         working-directory: protocols/v2/channels-sv2
         run: cargo semver-checks
@@ -105,14 +101,6 @@ jobs:
         working-directory: utils/bip32-key-derivation
         run: cargo semver-checks
 
-      - name: Run semver checks for utils/error-handling
-        working-directory: utils/error-handling
-        run: cargo semver-checks
-
-      - name: Run semver checks for utils/key-utils
-        working-directory: utils/key-utils
-        run: cargo semver-checks
-
       - name: Run semver checks for protocols/stratum-translation
         working-directory: protocols/stratum-translation
         run: cargo semver-checks

benches/Cargo.toml

@@ -12,7 +12,7 @@ v1 = { path="../protocols/v1", package="sv1_api" }
 serde_json = { version = "1.0.64", default-features = false, features = ["alloc"] }
 iai="0.1"
 mining_sv2 = { path = "../protocols/v2/subprotocols/mining" }
-roles_logic_sv2 = { path = "../protocols/v2/roles-logic-sv2" }
+roles_logic_sv2 = "5.0.0"
 framing_sv2 = { path = "../protocols/v2/framing-sv2" }
 serde = { version = "1.0.89", default-features = false, features = ["derive", "alloc"] }
 num-bigint = "0.4.3"

examples/ping-pong-encrypted/Cargo.toml

@@ -8,7 +8,6 @@ authors = [ "SRI Community" ]
 
 [dependencies]
 stratum-apps = { path = "../../roles/stratum-apps" }
-key-utils = { version = "^1.0.0", path = "../../utils/key-utils" }
 rand = "0.8"
 tokio = { version = "1.44.1", features = [ "full" ] }
 async-channel = "1.5.1"

examples/ping-pong-encrypted/src/client.rs

@@ -1,6 +1,6 @@
 use crate::messages::{Message, Ping, Pong, PING_MSG_TYPE, PONG_MSG_TYPE};
-use key_utils::Secp256k1PublicKey;
 use stratum_apps::{
+    key_utils::Secp256k1PublicKey,
     network_helpers::noise_connection::Connection,
     stratum_core::{
         binary_sv2,

examples/ping-pong-encrypted/src/error.rs

@@ -1,5 +1,5 @@
 use stratum_apps::{
-    network_helpers,
+    key_utils, network_helpers,
     stratum_core::{binary_sv2, codec_sv2, framing_sv2, noise_sv2},
 };
 

examples/ping-pong-encrypted/src/server.rs

@@ -2,8 +2,8 @@ use crate::{
     error::Error,
     messages::{Message, Ping, Pong, PING_MSG_TYPE, PONG_MSG_TYPE},
 };
-use key_utils::{Secp256k1PublicKey, Secp256k1SecretKey};
 use stratum_apps::{
+    key_utils::{Secp256k1PublicKey, Secp256k1SecretKey},
     network_helpers::noise_connection::Connection,
     stratum_core::{
         binary_sv2,

protocols/Cargo.toml

@@ -14,7 +14,6 @@ members = [
     "v2/subprotocols/template-distribution",
     "v2/subprotocols/mining",
     "v2/subprotocols/job-declaration",
-    "v2/roles-logic-sv2",
     "v2/channels-sv2",
     "v2/parsers-sv2", 
     "v2/handlers-sv2",

protocols/v2/codec-sv2/Cargo.toml

@@ -20,7 +20,7 @@ rand = { version = "0.8.5", default-features = false }
 tracing = { version = "0.1", optional = true }
 
 [dev-dependencies]
-key-utils = { path = "../../../utils/key-utils", version = "^1.0.0" }
+key-utils = { version = "1.2.0" }
 
 [features]
 default = ["std"]