From 6b6be07c23bcb38b4b5930025c87f57031df7f13 Mon Sep 17 00:00:00 2001 From: andrussal Date: Sat, 13 Dec 2025 06:01:13 +0100 Subject: [PATCH] Fix compose deployer import and metadata --- Cargo.toml | 78 +++++++++---------- .../runners/compose/src/deployer/mod.rs | 6 +- testing-framework/workflows/Cargo.toml | 26 +++---- 3 files changed, 56 insertions(+), 54 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 6c5eac2..7eacac4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -101,43 +101,43 @@ tokio = { default-features = false, version = "1" } tracing = { default-features = false, version = "0.1" } [patch."https://github.com/logos-co/nomos-node"] -broadcast-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/broadcast-service" } -chain-leader = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-leader" } -chain-network = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-network" } -chain-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-service" } -common-http-client = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-node/http-client" } -cryptarchia-engine = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/consensus/cryptarchia-engine" } -cryptarchia-sync = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/consensus/cryptarchia-sync" } -executor-http-client = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-executor/http-client" } -groth16 = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/groth16" } +broadcast-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/broadcast-service" } +chain-leader = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-leader" } +chain-network = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-network" } +chain-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/chain/chain-service" } +common-http-client = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-node/http-client" } +cryptarchia-engine = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/consensus/cryptarchia-engine" } +cryptarchia-sync = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/consensus/cryptarchia-sync" } +executor-http-client = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-executor/http-client" } +groth16 = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/groth16" } key-management-system-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/key-management-system" } -kzgrs = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/kzgrs" } -kzgrs-backend = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/kzgrs-backend" } -nomos-api = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/api" } -nomos-blend-message = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-blend/message" } -nomos-blend-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/blend" } -nomos-core = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-core/chain-defs" } -nomos-da-dispersal = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/dispersal" } -nomos-da-network-core = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/network/core" } -nomos-da-network-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/network" } -nomos-da-sampling = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/sampling" } -nomos-da-verifier = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/verifier" } -nomos-executor = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-executor/executor" } -nomos-http-api-common = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/api-common" } -nomos-ledger = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/ledger/nomos-ledger" } -nomos-libp2p = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-libp2p" } -nomos-network = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/network" } -nomos-node = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-node/node" } -nomos-sdp = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/sdp" } -nomos-time = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/time" } -nomos-tracing = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-tracing" } -nomos-tracing-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/tracing" } -nomos-utils = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-utils" } -nomos-wallet = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/wallet" } -poc = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/poc" } -pol = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/pol" } -subnetworks-assignations = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/network/subnetworks-assignations" } -tests = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/tests" } -tx-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/tx-service" } -wallet = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/wallet" } -zksign = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/zksign" } +kzgrs = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/kzgrs" } +kzgrs-backend = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/kzgrs-backend" } +nomos-api = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/api" } +nomos-blend-message = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-blend/message" } +nomos-blend-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/blend" } +nomos-core = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-core/chain-defs" } +nomos-da-dispersal = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/dispersal" } +nomos-da-network-core = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/network/core" } +nomos-da-network-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/network" } +nomos-da-sampling = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/sampling" } +nomos-da-verifier = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/data-availability/verifier" } +nomos-executor = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-executor/executor" } +nomos-http-api-common = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/api-common" } +nomos-ledger = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/ledger/nomos-ledger" } +nomos-libp2p = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-libp2p" } +nomos-network = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/network" } +nomos-node = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nodes/nomos-node/node" } +nomos-sdp = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/sdp" } +nomos-time = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/time" } +nomos-tracing = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-tracing" } +nomos-tracing-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/tracing" } +nomos-utils = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-utils" } +nomos-wallet = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/wallet" } +poc = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/poc" } +pol = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/pol" } +subnetworks-assignations = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-da/network/subnetworks-assignations" } +tests = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/tests" } +tx-service = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/nomos-services/tx-service" } +wallet = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/wallet" } +zksign = { path = "/Users/andrussalumets/IdeaProjects/nomos-node/zk/proofs/zksign" } diff --git a/testing-framework/runners/compose/src/deployer/mod.rs b/testing-framework/runners/compose/src/deployer/mod.rs index c93d64f..8851de6 100644 --- a/testing-framework/runners/compose/src/deployer/mod.rs +++ b/testing-framework/runners/compose/src/deployer/mod.rs @@ -91,6 +91,7 @@ mod tests { host::{Host, PortOverrides}, }; use groth16::Fr; + use key_management_system_keys::keys::ZkPublicKey; use nomos_core::{ mantle::{GenesisTx as GenesisTxTrait, ledger::NoteId}, sdp::{ProviderId, ServiceType}, @@ -103,7 +104,6 @@ mod tests { GeneratedNodeConfig, GeneratedTopology, NodeRole as TopologyNodeRole, }, }; - use zksign::PublicKey; #[test] fn cfgsync_prebuilt_configs_preserve_genesis() { @@ -288,7 +288,9 @@ mod tests { } } - fn declaration_fingerprint(genesis: &G) -> Vec<(ServiceType, ProviderId, NoteId, PublicKey)> + fn declaration_fingerprint( + genesis: &G, + ) -> Vec<(ServiceType, ProviderId, NoteId, ZkPublicKey)> where G: GenesisTxTrait, { diff --git a/testing-framework/workflows/Cargo.toml b/testing-framework/workflows/Cargo.toml index 1add5fe..0af58b0 100644 --- a/testing-framework/workflows/Cargo.toml +++ b/testing-framework/workflows/Cargo.toml @@ -13,19 +13,19 @@ version = "0.1.0" workspace = true [dependencies] -async-trait = "0.1" -chain-service = { workspace = true } -ed25519-dalek = { version = "2.2.0", features = ["rand_core", "serde"] } -executor-http-client = { workspace = true } -key-management-system-service = { workspace = true } -nomos-core = { workspace = true } -rand = { workspace = true } -testing-framework-config = { workspace = true } -testing-framework-core = { workspace = true } -thiserror = { workspace = true } -futures = "0.3" -tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread", "time"] } -tracing = { workspace = true } +async-trait = "0.1" +chain-service = { workspace = true } +ed25519-dalek = { version = "2.2.0", features = ["rand_core", "serde"] } +executor-http-client = { workspace = true } +futures = "0.3" +key-management-system-service = { workspace = true } +nomos-core = { workspace = true } +rand = { workspace = true } +testing-framework-config = { workspace = true } +testing-framework-core = { workspace = true } +thiserror = { workspace = true } +tokio = { workspace = true, features = ["macros", "net", "rt-multi-thread", "time"] } +tracing = { workspace = true } [package.metadata.cargo-machete] ignored = ["chain-service"]