chore: linting, formatting and coverage workflow updated

Author: Mohiiit

.github/workflows/coverage.yml

@@ -49,7 +49,7 @@ jobs:
           cargo build --bin madara --profile dev
           export COVERAGE_BIN=$(realpath target/debug/madara)
           rm -f target/madara-* lcov.info
-          cargo test --profile dev --workspace --exclude=orchestrator --exclude=e2e-tests
+          cargo test --profile dev --package "mc-*" --package "mp-*"
 
       - name: Generate coverage info
         run: |

.github/workflows/orchestrator-coverage.yml

@@ -141,9 +141,8 @@ jobs:
             --lcov \
             --output-path lcov.info \
             --test-threads=1 \
-            --workspace \
-            --exclude=madara \
-            --exclude=e2e-tests
+            --package "orchestrator-*" \
+            --no-fail-fast
 
       - name: Coveralls
         uses: coverallsapp/github-action@v2

Cargo.toml

@@ -40,7 +40,7 @@ members = [
   "orchestrator/crates/settlement-clients/settlement-client-interface",
   "orchestrator/crates/settlement-clients/ethereum",
   "orchestrator/crates/settlement-clients/starknet",
-  "e2e-tests", # TODO: rename / merge with existing tests
+  "e2e-tests",                                                          # TODO: rename / merge with existing tests
 ]
 resolver = "2"
 # Everything except test-related packages, so that they are not compiled when doing `cargo build`.

e2e-tests/Cargo.toml

@@ -25,11 +25,12 @@ clap.workspace = true
 color-eyre.workspace = true
 dotenvy.workspace = true
 env_logger.workspace = true
-orchestrator-ethereum-settlement-client.workspace = true
 httpmock = { version = "0.8.0-alpha.1", features = ["proxy", "remote"] }
 log.workspace = true
 mongodb.workspace = true
 orchestrator-core.workspace = true
+orchestrator-ethereum-settlement-client.workspace = true
+orchestrator-utils.workspace = true
 reqwest = { workspace = true, features = ["json"] }
 rstest.workspace = true
 serde.workspace = true
@@ -42,7 +43,6 @@ tokio = { workspace = true, features = ["full"] }
 tokio-stream.workspace = true
 tokio-util.workspace = true
 url.workspace = true
-orchestrator-utils.workspace = true
 uuid.workspace = true
 
 [[test]]

e2e-tests/src/anvil.rs

@@ -7,9 +7,9 @@ use alloy::primitives::{fixed_bytes, Address, Bytes, I256, U256};
 use alloy::providers::ProviderBuilder;
 use alloy::signers::local::PrivateKeySigner;
 use alloy::sol;
+use orchestrator_utils::env_utils::get_env_var_or_panic;
 use tokio::time::sleep;
 use url::Url;
-use utils::env_utils::get_env_var_or_panic;
 
 sol!(
     #[allow(missing_docs)]

e2e-tests/src/mock_server.rs

@@ -1,9 +1,9 @@
 use std::collections::HashMap;
 
 use httpmock::MockServer;
+use orchestrator_utils::env_utils::get_env_var_or_panic;
 use reqwest::Client;
 use serde_json::Value;
-use utils::env_utils::get_env_var_or_panic;
 
 #[allow(dead_code)]
 /// MockServerGlobal (has mock server inside)

e2e-tests/tests.rs

@@ -20,12 +20,12 @@ use orchestrator::jobs::types::{ExternalId, JobItem, JobStatus, JobType};
 use orchestrator::queue::job_queue::JobQueueMessage;
 use orchestrator::queue::sqs::AWSSQSValidatedArgs;
 use orchestrator::queue::QueueType;
+use orchestrator_utils::env_utils::get_env_var_or_panic;
 use rstest::rstest;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use starknet::core::types::{Felt, MaybePendingStateUpdate};
 use url::Url;
-use utils::env_utils::get_env_var_or_panic;
 use uuid::Uuid;
 
 extern crate e2e_tests;

orchestrator/crates/da-clients/ethereum/Cargo.toml

@@ -18,16 +18,16 @@ alloy = { git = "https://github.com/alloy-rs/alloy", rev = "68952c0", features =
 async-trait = { workspace = true }
 c-kzg = { workspace = true }
 color-eyre = { workspace = true }
-orchestrator-da-client-interface = { workspace = true }
 dotenvy.workspace = true
 mockall = { workspace = true }
+orchestrator-da-client-interface = { workspace = true }
+orchestrator-utils = { workspace = true }
 reqwest = { workspace = true }
 rstest = { workspace = true }
 serde = { workspace = true, features = ["derive"] }
 starknet = { workspace = true }
 tokio = { workspace = true }
 url = { workspace = true }
-orchestrator-utils = { workspace = true }
 
 #Instrumentation
 opentelemetry = { workspace = true, features = ["metrics", "logs"] }

orchestrator/crates/orchestrator/Cargo.toml

@@ -23,7 +23,6 @@ alloy = { version = "0.2.1", features = [
 assert_matches = { workspace = true }
 async-std = { workspace = true }
 async-trait = { workspace = true }
-orchestrator-atlantic-service = { workspace = true }
 aws-config = { workspace = true, features = ["behavior-version-latest"] }
 aws-credential-types = { workspace = true, features = [
   "hardcoded-credentials",
@@ -41,10 +40,7 @@ cairo-vm = { workspace = true }
 chrono = { workspace = true }
 clap = { workspace = true }
 color-eyre = { workspace = true }
-orchestrator-da-client-interface = { workspace = true }
 dotenvy = { workspace = true }
-orchestrator-ethereum-da-client = { workspace = true, optional = true }
-orchestrator-ethereum-settlement-client = { workspace = true }
 futures = { workspace = true }
 hex = { workspace = true }
 itertools = { workspace = true }
@@ -60,25 +56,29 @@ num-bigint = { workspace = true }
 num-traits = { workspace = true }
 omniqueue = { workspace = true, optional = true }
 once_cell = { workspace = true }
-prove_block = { workspace = true }
+orchestrator-atlantic-service = { workspace = true }
+orchestrator-da-client-interface = { workspace = true }
+orchestrator-ethereum-da-client = { workspace = true, optional = true }
+orchestrator-ethereum-settlement-client = { workspace = true }
 orchestrator-prover-client-interface = { workspace = true }
+orchestrator-settlement-client-interface = { workspace = true }
+orchestrator-sharp-service = { workspace = true }
+orchestrator-starknet-settlement-client = { workspace = true }
+prove_block = { workspace = true }
 rstest = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-orchestrator-settlement-client-interface = { workspace = true }
-orchestrator-sharp-service = { workspace = true }
 starknet = { workspace = true }
 starknet-core = { workspace = true }
 starknet-os = { workspace = true }
-orchestrator-starknet-settlement-client = { workspace = true }
 strum = { workspace = true }
 strum_macros = { workspace = true }
 tempfile = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true, features = ["sync", "macros", "rt-multi-thread"] }
 
-url = { workspace = true }
 orchestrator-utils = { workspace = true }
+url = { workspace = true }
 uuid = { workspace = true, features = ["v4", "serde"] }
 
 aws-sdk-iam = { workspace = true }

orchestrator/crates/prover-clients/atlantic-service/Cargo.toml

@@ -12,12 +12,13 @@ chrono.workspace = true
 color-eyre.workspace = true
 dotenvy.workspace = true
 env_logger.workspace = true
-orchestrator-gps-fact-checker.workspace = true
 hex.workspace = true
 httpmock = { version = "0.8.0-alpha.1", features = ["proxy", "remote"] }
 lazy_static.workspace = true
 log.workspace = true
+orchestrator-gps-fact-checker.workspace = true
 orchestrator-prover-client-interface.workspace = true
+orchestrator-utils.workspace = true
 reqwest.workspace = true
 rstest.workspace = true
 serde.workspace = true
@@ -30,7 +31,6 @@ thiserror.workspace = true
 tokio.workspace = true
 tokio-util = { version = "0.7.12", features = ["codec"] }
 url.workspace = true
-orchestrator-utils.workspace = true
 uuid.workspace = true
 
 #Instrumentation