From 96842b8628b3582129d03ea0585e848a80104a04 Mon Sep 17 00:00:00 2001 From: andrussal Date: Mon, 16 Feb 2026 11:54:21 +0100 Subject: [PATCH] fix: align lb-framework with local testing framework crates --- Cargo.lock | 57 ++++---------------- Cargo.toml | 5 ++ logos/examples/tests/node_config_override.rs | 1 + 3 files changed, 17 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f9c0c49..3bff296 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -925,7 +925,7 @@ dependencies = [ "clap", "serde", "serde_yaml", - "testing-framework-core 0.1.0", + "testing-framework-core", "tokio", ] @@ -2904,8 +2904,8 @@ dependencies = [ "serde", "serde_yaml", "tempfile", - "testing-framework-core 0.1.0", - "testing-framework-env 0.1.0", + "testing-framework-core", + "testing-framework-env", "testing-framework-runner-compose", "testing-framework-runner-k8s", "testing_framework", @@ -2920,7 +2920,7 @@ name = "lb-workloads" version = "0.1.0" dependencies = [ "lb-ext", - "testing-framework-core 0.1.0", + "testing-framework-core", "testing_framework", "thiserror 2.0.18", "tokio", @@ -5782,7 +5782,7 @@ dependencies = [ "async-trait", "lb-ext", "lb-workloads", - "testing-framework-core 0.1.0", + "testing-framework-core", "testing-framework-runner-compose", "testing-framework-runner-k8s", "testing_framework", @@ -6502,31 +6502,10 @@ dependencies = [ "tracing", ] -[[package]] -name = "testing-framework-core" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain-testing.git?rev=e9b41263041897b4983b7ee8b4ea495d18a64641#e9b41263041897b4983b7ee8b4ea495d18a64641" -dependencies = [ - "async-trait", - "futures", - "parking_lot", - "prometheus-http-query", - "rand 0.8.5", - "reqwest", - "thiserror 2.0.18", - "tokio", - "tracing", -] - [[package]] name = "testing-framework-env" version = "0.1.0" -[[package]] -name = "testing-framework-env" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain-testing.git?rev=e9b41263041897b4983b7ee8b4ea495d18a64641#e9b41263041897b4983b7ee8b4ea495d18a64641" - [[package]] name = "testing-framework-runner-compose" version = "0.1.0" @@ -6541,7 +6520,7 @@ dependencies = [ "serde_json", "tempfile", "tera", - "testing-framework-core 0.1.0", + "testing-framework-core", "thiserror 2.0.18", "tokio", "tokio-retry", @@ -6559,7 +6538,7 @@ dependencies = [ "k8s-openapi", "kube", "reqwest", - "testing-framework-core 0.1.0", + "testing-framework-core", "thiserror 2.0.18", "tokio", "tokio-retry", @@ -6573,21 +6552,7 @@ version = "0.1.0" dependencies = [ "async-trait", "tempfile", - "testing-framework-core 0.1.0", - "thiserror 2.0.18", - "tokio", - "tokio-retry", - "tracing", -] - -[[package]] -name = "testing-framework-runner-local" -version = "0.1.0" -source = "git+https://github.com/logos-blockchain/logos-blockchain-testing.git?rev=e9b41263041897b4983b7ee8b4ea495d18a64641#e9b41263041897b4983b7ee8b4ea495d18a64641" -dependencies = [ - "async-trait", - "tempfile", - "testing-framework-core 0.1.0 (git+https://github.com/logos-blockchain/logos-blockchain-testing.git?rev=e9b41263041897b4983b7ee8b4ea495d18a64641)", + "testing-framework-core", "thiserror 2.0.18", "tokio", "tokio-retry", @@ -6626,9 +6591,9 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "testing-framework-core 0.1.0 (git+https://github.com/logos-blockchain/logos-blockchain-testing.git?rev=e9b41263041897b4983b7ee8b4ea495d18a64641)", - "testing-framework-env 0.1.0 (git+https://github.com/logos-blockchain/logos-blockchain-testing.git?rev=e9b41263041897b4983b7ee8b4ea495d18a64641)", - "testing-framework-runner-local 0.1.0 (git+https://github.com/logos-blockchain/logos-blockchain-testing.git?rev=e9b41263041897b4983b7ee8b4ea495d18a64641)", + "testing-framework-core", + "testing-framework-env", + "testing-framework-runner-local", "thiserror 2.0.18", "time", "tokio", diff --git a/Cargo.toml b/Cargo.toml index 7c3c61c..528db3a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -102,3 +102,8 @@ time = { default-features = false, version = "0.3" } tokio = { default-features = false, version = "1" } tracing = { default-features = false, version = "0.1" } uuid = { default-features = false, version = "1", features = ["v4"] } + +[patch."https://github.com/logos-blockchain/logos-blockchain-testing.git"] +testing-framework-core = { path = "testing-framework/core" } +testing-framework-env = { path = "logos/runtime/env" } +testing-framework-runner-local = { path = "testing-framework/deployers/local" } diff --git a/logos/examples/tests/node_config_override.rs b/logos/examples/tests/node_config_override.rs index 08a5e58..5761eae 100644 --- a/logos/examples/tests/node_config_override.rs +++ b/logos/examples/tests/node_config_override.rs @@ -67,6 +67,7 @@ async fn scenario_builder_api_port_override() -> Result<()> { let base_descriptors = base_builder.clone().build()?; let base_node = base_descriptors.nodes().first().expect("node 0 descriptor"); let mut run_config = build_node_run_config( + &base_descriptors, base_node, base_descriptors .config()