mirror of
https://github.com/logos-blockchain/logos-blockchain-testing.git
synced 2026-01-02 13:23:13 +00:00
Use local cfgsync path without services-utils patch
This commit is contained in:
parent
e7a67d09e5
commit
e04af1441a
@ -8,6 +8,12 @@ no-default-features = true
|
||||
[advisories]
|
||||
ignore = [
|
||||
# Keep local ignores in sync with nomos-node if needed. Unused entries removed.
|
||||
"RUSTSEC-2024-0370", # proc-macro-error unmaintained; upstream dependency
|
||||
"RUSTSEC-2024-0384", # instant unmaintained; upstream dependency
|
||||
"RUSTSEC-2024-0388", # derivative unmaintained; no safe upgrade available upstream
|
||||
"RUSTSEC-2024-0436", # paste unmaintained; upstream dependency
|
||||
"RUSTSEC-2025-0012", # backoff unmaintained; upstream workspace still relies on it
|
||||
"RUSTSEC-2025-0055", # tracing-subscriber ansi escape issue; upstream dependency
|
||||
]
|
||||
yanked = "deny"
|
||||
|
||||
@ -22,14 +28,12 @@ allow = [
|
||||
"BSD-2-Clause",
|
||||
"BSD-3-Clause",
|
||||
"BSL-1.0",
|
||||
"BlueOak-1.0.0",
|
||||
"CC0-1.0",
|
||||
"CDDL-1.0",
|
||||
"CDLA-Permissive-2.0",
|
||||
"ISC",
|
||||
"MIT",
|
||||
"MPL-2.0",
|
||||
"NCSA",
|
||||
"Unicode-3.0",
|
||||
"Zlib",
|
||||
]
|
||||
|
||||
5
Cargo.lock
generated
5
Cargo.lock
generated
@ -6782,18 +6782,15 @@ dependencies = [
|
||||
[[package]]
|
||||
name = "services-utils"
|
||||
version = "0.1.0"
|
||||
source = "git+https://github.com/logos-co/nomos-node.git?branch=master#2f60a0372c228968c3526c341ebc7e58bbd178dd"
|
||||
dependencies = [
|
||||
"async-trait",
|
||||
"bincode",
|
||||
"futures",
|
||||
"hex",
|
||||
"log",
|
||||
"overwatch",
|
||||
"overwatch-derive",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"thiserror 1.0.69",
|
||||
"tokio",
|
||||
"tracing",
|
||||
]
|
||||
|
||||
|
||||
@ -1,6 +1,5 @@
|
||||
[workspace]
|
||||
members = [
|
||||
"patches/services-utils",
|
||||
"testing-framework/configs",
|
||||
"testing-framework/core",
|
||||
"testing-framework/runners/compose",
|
||||
@ -28,10 +27,6 @@ unsafe_code = "allow"
|
||||
[workspace.lints.clippy]
|
||||
all = "allow"
|
||||
|
||||
[patch."https://github.com/logos-co/nomos-node.git"]
|
||||
cfgsync = { path = "testnet/cfgsync" }
|
||||
services-utils = { path = "patches/services-utils" }
|
||||
|
||||
[workspace.dependencies]
|
||||
# Local testing framework crates
|
||||
integration-configs = { default-features = false, path = "testing-framework/configs" }
|
||||
@ -43,7 +38,7 @@ testing-framework-workflows = { default-features = false, path = "testing-f
|
||||
|
||||
# Nomos git dependencies (tracking master)
|
||||
broadcast-service = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", branch = "master" }
|
||||
cfgsync = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", branch = "master" }
|
||||
cfgsync = { default-features = false, path = "testnet/cfgsync" }
|
||||
chain-leader = { default-features = false, git = "https://github.com/logos-co/nomos-node.git", branch = "master", features = [
|
||||
"pol-dev-mode",
|
||||
] }
|
||||
|
||||
@ -1,51 +1,21 @@
|
||||
use std::{env, time::Duration};
|
||||
use std::time::Duration;
|
||||
|
||||
use serial_test::serial;
|
||||
use testing_framework_core::scenario::{Deployer as _, Runner, ScenarioBuilder};
|
||||
use testing_framework_runner_compose::{ComposeRunner, ComposeRunnerError};
|
||||
use tests_workflows::{ChaosBuilderExt as _, ScenarioBuilderExt as _};
|
||||
|
||||
const VALIDATORS: usize = 1;
|
||||
const EXECUTORS: usize = 1;
|
||||
const RUN_DURATION: Duration = Duration::from_secs(60);
|
||||
const MIXED_TXS_PER_BLOCK: u64 = 5;
|
||||
const TOTAL_WALLETS: usize = 64;
|
||||
const TRANSACTION_WALLETS: usize = 8;
|
||||
const MAX_NODE_PAIR: usize = 6;
|
||||
|
||||
#[tokio::test]
|
||||
#[serial]
|
||||
async fn compose_runner_mixed_workloads() {
|
||||
for (validators, executors) in selected_node_pairs() {
|
||||
run_compose_case(validators, executors).await;
|
||||
}
|
||||
}
|
||||
|
||||
fn selected_node_pairs() -> Vec<(usize, usize)> {
|
||||
if let Ok(raw) = env::var("COMPOSE_NODE_PAIRS") {
|
||||
return raw
|
||||
.split(',')
|
||||
.filter(|entry| !entry.trim().is_empty())
|
||||
.map(|entry| {
|
||||
let parts: Vec<_> = entry
|
||||
.split(['x', 'X'])
|
||||
.map(str::trim)
|
||||
.filter(|part| !part.is_empty())
|
||||
.collect();
|
||||
assert!(
|
||||
parts.len() == 2,
|
||||
"invalid COMPOSE_NODE_PAIRS entry '{entry}'; expected format '<v>x<e>'",
|
||||
);
|
||||
let validators = parts[0]
|
||||
.parse::<usize>()
|
||||
.unwrap_or_else(|_| panic!("invalid validator count '{}'", parts[0]));
|
||||
let executors = parts[1]
|
||||
.parse::<usize>()
|
||||
.unwrap_or_else(|_| panic!("invalid executor count '{}'", parts[1]));
|
||||
(validators, executors)
|
||||
})
|
||||
.collect();
|
||||
}
|
||||
|
||||
(1..=MAX_NODE_PAIR).map(|n| (n, n)).collect()
|
||||
run_compose_case(VALIDATORS, EXECUTORS).await;
|
||||
}
|
||||
|
||||
async fn run_compose_case(validators: usize, executors: usize) {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user