From 0b61b45822c2e64a193ab87863f6c647768a8ed2 Mon Sep 17 00:00:00 2001 From: danielsanchezq Date: Mon, 8 Jan 2024 17:14:27 +0100 Subject: [PATCH] Rename consensus service to carnot consensus --- Cargo.toml | 2 +- nodes/nomos-node/Cargo.toml | 2 +- nodes/nomos-node/src/lib.rs | 4 ++-- nomos-cli/Cargo.toml | 2 +- nomos-cli/src/api/consensus.rs | 2 +- nomos-services/api/Cargo.toml | 2 +- nomos-services/api/src/http/consensus.rs | 8 ++++---- .../{consensus => carnot-consensus}/Cargo.toml | 2 +- .../src/committee_membership/mod.rs | 0 .../src/leader_selection/mod.rs | 0 .../{consensus => carnot-consensus}/src/lib.rs | 0 .../src/network/adapters/libp2p.rs | 0 .../src/network/adapters/mock.rs | 0 .../src/network/adapters/mod.rs | 0 .../src/network/messages.rs | 0 .../src/network/mod.rs | 0 .../src/tally/happy.rs | 0 .../{consensus => carnot-consensus}/src/tally/mod.rs | 0 .../src/tally/timeout.rs | 0 .../src/tally/unhappy.rs | 0 .../src/task_manager.rs | 0 .../{consensus => carnot-consensus}/src/test.rs | 0 .../src/view_cancel.rs | 0 simulations/Cargo.toml | 2 +- simulations/src/node/carnot/event_builder.rs | 4 ++-- simulations/src/node/carnot/messages.rs | 4 ++-- simulations/src/node/carnot/mod.rs | 12 ++++++------ tests/Cargo.toml | 2 +- tests/src/nodes/nomos.rs | 2 +- tests/src/tests/unhappy.rs | 2 +- 30 files changed, 26 insertions(+), 26 deletions(-) rename nomos-services/{consensus => carnot-consensus}/Cargo.toml (97%) rename nomos-services/{consensus => carnot-consensus}/src/committee_membership/mod.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/leader_selection/mod.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/lib.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/network/adapters/libp2p.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/network/adapters/mock.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/network/adapters/mod.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/network/messages.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/network/mod.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/tally/happy.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/tally/mod.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/tally/timeout.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/tally/unhappy.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/task_manager.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/test.rs (100%) rename nomos-services/{consensus => carnot-consensus}/src/view_cancel.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index 2b549504..f96f4514 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ "nomos-services/metrics", "nomos-services/network", "nomos-services/storage", - "nomos-services/consensus", + "nomos-services/carnot-consensus", "nomos-services/mempool", "nomos-services/http", "nomos-services/data-availability", diff --git a/nodes/nomos-node/Cargo.toml b/nodes/nomos-node/Cargo.toml index 1c5ebbf5..27a0c1d5 100644 --- a/nodes/nomos-node/Cargo.toml +++ b/nodes/nomos-node/Cargo.toml @@ -25,7 +25,7 @@ nomos-api = { path = "../../nomos-services/api" } nomos-log = { path = "../../nomos-services/log" } nomos-mempool = { path = "../../nomos-services/mempool", features = ["mock", "libp2p"] } nomos-http = { path = "../../nomos-services/http", features = ["http"] } -nomos-consensus = { path = "../../nomos-services/consensus", features = ["libp2p"] } +carnot-consensus = { path = "../../nomos-services/carnot-consensus", features = ["libp2p"] } nomos-storage = { path = "../../nomos-services/storage", features = ["sled"] } nomos-libp2p = { path = "../../nomos-libp2p" } nomos-da = { path = "../../nomos-services/data-availability", features = ["libp2p"] } diff --git a/nodes/nomos-node/src/lib.rs b/nodes/nomos-node/src/lib.rs index 66643704..4db22e5d 100644 --- a/nodes/nomos-node/src/lib.rs +++ b/nodes/nomos-node/src/lib.rs @@ -2,18 +2,18 @@ pub mod api; mod config; mod tx; +use carnot_consensus::network::adapters::libp2p::Libp2pAdapter as ConsensusLibp2pAdapter; use carnot_engine::overlay::{RandomBeaconState, RoundRobin, TreeOverlay}; use color_eyre::eyre::Result; use full_replication::Certificate; use full_replication::{AbsoluteNumber, Attestation, Blob, FullReplication}; #[cfg(feature = "metrics")] use metrics::{backend::map::MapMetricsBackend, types::MetricsData, MetricsService}; -use nomos_consensus::network::adapters::libp2p::Libp2pAdapter as ConsensusLibp2pAdapter; use api::AxumBackend; use bytes::Bytes; +use carnot_consensus::CarnotConsensus; use nomos_api::ApiService; -use nomos_consensus::CarnotConsensus; use nomos_core::{ da::{blob, certificate}, tx::Transaction, diff --git a/nomos-cli/Cargo.toml b/nomos-cli/Cargo.toml index 8e7ebc7b..f14f1c01 100644 --- a/nomos-cli/Cargo.toml +++ b/nomos-cli/Cargo.toml @@ -20,7 +20,7 @@ overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" } nomos-network = { path = "../nomos-services/network", features = ["libp2p"] } nomos-da = { path = "../nomos-services/data-availability", features = ["libp2p"] } -nomos-consensus = { path = "../nomos-services/consensus" } +carnot-consensus = { path = "../nomos-services/carnot-consensus" } nomos-log = { path = "../nomos-services/log" } nomos-libp2p = { path = "../nomos-libp2p"} nomos-core = { path = "../nomos-core" } diff --git a/nomos-cli/src/api/consensus.rs b/nomos-cli/src/api/consensus.rs index 2969de50..86d31592 100644 --- a/nomos-cli/src/api/consensus.rs +++ b/nomos-cli/src/api/consensus.rs @@ -1,6 +1,6 @@ use super::CLIENT; +use carnot_consensus::CarnotInfo; use carnot_engine::{Block, BlockId}; -use nomos_consensus::CarnotInfo; use reqwest::Url; pub async fn carnot_info(node: &Url) -> Result { diff --git a/nomos-services/api/Cargo.toml b/nomos-services/api/Cargo.toml index 0d508e83..5c557026 100644 --- a/nomos-services/api/Cargo.toml +++ b/nomos-services/api/Cargo.toml @@ -15,7 +15,7 @@ tracing = "0.1" carnot-engine = { path = "../../consensus/carnot-engine" } nomos-core = { path = "../../nomos-core" } -nomos-consensus = { path = "../../nomos-services/consensus" } +carnot-consensus = { path = "../carnot-consensus" } nomos-network = { path = "../../nomos-services/network" } nomos-da = { path = "../../nomos-services/data-availability" } nomos-mempool = { path = "../../nomos-services/mempool", features = ["mock", "libp2p", "openapi"] } diff --git a/nomos-services/api/src/http/consensus.rs b/nomos-services/api/src/http/consensus.rs index f02bd885..a858ebff 100644 --- a/nomos-services/api/src/http/consensus.rs +++ b/nomos-services/api/src/http/consensus.rs @@ -4,15 +4,15 @@ use overwatch_rs::overwatch::handle::OverwatchHandle; use serde::{de::DeserializeOwned, Serialize}; use tokio::sync::oneshot; +use carnot_consensus::{ + network::adapters::libp2p::Libp2pAdapter as ConsensusLibp2pAdapter, CarnotConsensus, + CarnotInfo, ConsensusMsg, +}; use carnot_engine::{ overlay::{RandomBeaconState, RoundRobin, TreeOverlay}, Block, BlockId, }; use full_replication::Certificate; -use nomos_consensus::{ - network::adapters::libp2p::Libp2pAdapter as ConsensusLibp2pAdapter, CarnotConsensus, - CarnotInfo, ConsensusMsg, -}; use nomos_core::{ da::{ blob, diff --git a/nomos-services/consensus/Cargo.toml b/nomos-services/carnot-consensus/Cargo.toml similarity index 97% rename from nomos-services/consensus/Cargo.toml rename to nomos-services/carnot-consensus/Cargo.toml index 054a9ff0..e84e3fb3 100644 --- a/nomos-services/consensus/Cargo.toml +++ b/nomos-services/carnot-consensus/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "nomos-consensus" +name = "carnot-consensus" version = "0.1.0" edition = "2021" diff --git a/nomos-services/consensus/src/committee_membership/mod.rs b/nomos-services/carnot-consensus/src/committee_membership/mod.rs similarity index 100% rename from nomos-services/consensus/src/committee_membership/mod.rs rename to nomos-services/carnot-consensus/src/committee_membership/mod.rs diff --git a/nomos-services/consensus/src/leader_selection/mod.rs b/nomos-services/carnot-consensus/src/leader_selection/mod.rs similarity index 100% rename from nomos-services/consensus/src/leader_selection/mod.rs rename to nomos-services/carnot-consensus/src/leader_selection/mod.rs diff --git a/nomos-services/consensus/src/lib.rs b/nomos-services/carnot-consensus/src/lib.rs similarity index 100% rename from nomos-services/consensus/src/lib.rs rename to nomos-services/carnot-consensus/src/lib.rs diff --git a/nomos-services/consensus/src/network/adapters/libp2p.rs b/nomos-services/carnot-consensus/src/network/adapters/libp2p.rs similarity index 100% rename from nomos-services/consensus/src/network/adapters/libp2p.rs rename to nomos-services/carnot-consensus/src/network/adapters/libp2p.rs diff --git a/nomos-services/consensus/src/network/adapters/mock.rs b/nomos-services/carnot-consensus/src/network/adapters/mock.rs similarity index 100% rename from nomos-services/consensus/src/network/adapters/mock.rs rename to nomos-services/carnot-consensus/src/network/adapters/mock.rs diff --git a/nomos-services/consensus/src/network/adapters/mod.rs b/nomos-services/carnot-consensus/src/network/adapters/mod.rs similarity index 100% rename from nomos-services/consensus/src/network/adapters/mod.rs rename to nomos-services/carnot-consensus/src/network/adapters/mod.rs diff --git a/nomos-services/consensus/src/network/messages.rs b/nomos-services/carnot-consensus/src/network/messages.rs similarity index 100% rename from nomos-services/consensus/src/network/messages.rs rename to nomos-services/carnot-consensus/src/network/messages.rs diff --git a/nomos-services/consensus/src/network/mod.rs b/nomos-services/carnot-consensus/src/network/mod.rs similarity index 100% rename from nomos-services/consensus/src/network/mod.rs rename to nomos-services/carnot-consensus/src/network/mod.rs diff --git a/nomos-services/consensus/src/tally/happy.rs b/nomos-services/carnot-consensus/src/tally/happy.rs similarity index 100% rename from nomos-services/consensus/src/tally/happy.rs rename to nomos-services/carnot-consensus/src/tally/happy.rs diff --git a/nomos-services/consensus/src/tally/mod.rs b/nomos-services/carnot-consensus/src/tally/mod.rs similarity index 100% rename from nomos-services/consensus/src/tally/mod.rs rename to nomos-services/carnot-consensus/src/tally/mod.rs diff --git a/nomos-services/consensus/src/tally/timeout.rs b/nomos-services/carnot-consensus/src/tally/timeout.rs similarity index 100% rename from nomos-services/consensus/src/tally/timeout.rs rename to nomos-services/carnot-consensus/src/tally/timeout.rs diff --git a/nomos-services/consensus/src/tally/unhappy.rs b/nomos-services/carnot-consensus/src/tally/unhappy.rs similarity index 100% rename from nomos-services/consensus/src/tally/unhappy.rs rename to nomos-services/carnot-consensus/src/tally/unhappy.rs diff --git a/nomos-services/consensus/src/task_manager.rs b/nomos-services/carnot-consensus/src/task_manager.rs similarity index 100% rename from nomos-services/consensus/src/task_manager.rs rename to nomos-services/carnot-consensus/src/task_manager.rs diff --git a/nomos-services/consensus/src/test.rs b/nomos-services/carnot-consensus/src/test.rs similarity index 100% rename from nomos-services/consensus/src/test.rs rename to nomos-services/carnot-consensus/src/test.rs diff --git a/nomos-services/consensus/src/view_cancel.rs b/nomos-services/carnot-consensus/src/view_cancel.rs similarity index 100% rename from nomos-services/consensus/src/view_cancel.rs rename to nomos-services/carnot-consensus/src/view_cancel.rs diff --git a/simulations/Cargo.toml b/simulations/Cargo.toml index fbbc3225..49b6b0e1 100644 --- a/simulations/Cargo.toml +++ b/simulations/Cargo.toml @@ -26,7 +26,7 @@ futures = "0.3" humantime = "2.1" humantime-serde = "1" nomos-core = { path = "../nomos-core" } -nomos-consensus = { path = "../nomos-services/consensus" } +carnot-consensus = { path = "../nomos-services/carnot-consensus" } once_cell = "1.17" parking_lot = "0.12" polars = { version = "0.27", features = ["serde", "object", "json", "csv-file", "parquet", "dtype-struct"], optional = true } diff --git a/simulations/src/node/carnot/event_builder.rs b/simulations/src/node/carnot/event_builder.rs index 8803d2fa..6e8bdb4f 100644 --- a/simulations/src/node/carnot/event_builder.rs +++ b/simulations/src/node/carnot/event_builder.rs @@ -1,9 +1,9 @@ use crate::node::carnot::{messages::CarnotMessage, tally::Tally, timeout::TimeoutHandler}; +use carnot_consensus::network::messages::{NewViewMsg, TimeoutMsg, VoteMsg}; +use carnot_consensus::NodeId; use carnot_engine::{ AggregateQc, Carnot, NewView, Overlay, Qc, StandardQc, Timeout, TimeoutQc, View, Vote, }; -use nomos_consensus::network::messages::{NewViewMsg, TimeoutMsg, VoteMsg}; -use nomos_consensus::NodeId; use nomos_core::block::Block; use std::collections::HashSet; use std::hash::Hash; diff --git a/simulations/src/node/carnot/messages.rs b/simulations/src/node/carnot/messages.rs index ca42c426..ef8188cc 100644 --- a/simulations/src/node/carnot/messages.rs +++ b/simulations/src/node/carnot/messages.rs @@ -1,7 +1,7 @@ -use carnot_engine::View; -use nomos_consensus::network::messages::{ +use carnot_consensus::network::messages::{ NewViewMsg, ProposalMsg, TimeoutMsg, TimeoutQcMsg, VoteMsg, }; +use carnot_engine::View; use crate::network::PayloadSize; diff --git a/simulations/src/node/carnot/mod.rs b/simulations/src/node/carnot/mod.rs index 5b3e228b..37edd74c 100644 --- a/simulations/src/node/carnot/mod.rs +++ b/simulations/src/node/carnot/mod.rs @@ -29,16 +29,16 @@ use crate::output_processors::{Record, RecordType, Runtime}; use crate::settings::SimulationSettings; use crate::streaming::SubscriberFormat; use crate::warding::SimulationState; +use carnot_consensus::committee_membership::UpdateableCommitteeMembership; +use carnot_consensus::network::messages::{ProposalMsg, TimeoutQcMsg}; +use carnot_consensus::{ + leader_selection::UpdateableLeaderSelection, + network::messages::{NewViewMsg, TimeoutMsg, VoteMsg}, +}; use carnot_engine::overlay::RandomBeaconState; use carnot_engine::{ Block, BlockId, Carnot, Committee, Overlay, Payload, Qc, StandardQc, TimeoutQc, View, Vote, }; -use nomos_consensus::committee_membership::UpdateableCommitteeMembership; -use nomos_consensus::network::messages::{ProposalMsg, TimeoutQcMsg}; -use nomos_consensus::{ - leader_selection::UpdateableLeaderSelection, - network::messages::{NewViewMsg, TimeoutMsg, VoteMsg}, -}; static RECORD_SETTINGS: std::sync::OnceLock> = std::sync::OnceLock::new(); diff --git a/tests/Cargo.toml b/tests/Cargo.toml index cae6b998..4b4313db 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -6,7 +6,7 @@ publish = false [dependencies] nomos-node = { path = "../nodes/nomos-node", default-features = false } -nomos-consensus = { path = "../nomos-services/consensus" } +carnot-consensus = { path = "../nomos-services/carnot-consensus" } nomos-network = { path = "../nomos-services/network", features = ["libp2p"]} nomos-log = { path = "../nomos-services/log" } nomos-api = { path = "../nomos-services/api" } diff --git a/tests/src/nodes/nomos.rs b/tests/src/nodes/nomos.rs index ef3e4f47..984357a3 100644 --- a/tests/src/nodes/nomos.rs +++ b/tests/src/nodes/nomos.rs @@ -4,13 +4,13 @@ use std::process::{Child, Command, Stdio}; use std::time::Duration; // internal use crate::{adjust_timeout, get_available_port, ConsensusConfig, MixnetConfig, Node, SpawnConfig}; +use carnot_consensus::{CarnotInfo, CarnotSettings}; use carnot_engine::overlay::{RandomBeaconState, RoundRobin, TreeOverlay, TreeOverlaySettings}; use carnot_engine::{BlockId, NodeId, Overlay}; use full_replication::Certificate; use mixnet_client::{MixnetClientConfig, MixnetClientMode}; use mixnet_node::MixnetNodeConfig; use mixnet_topology::MixnetTopology; -use nomos_consensus::{CarnotInfo, CarnotSettings}; use nomos_core::block::Block; use nomos_libp2p::{multiaddr, Multiaddr}; use nomos_log::{LoggerBackend, LoggerFormat}; diff --git a/tests/src/tests/unhappy.rs b/tests/src/tests/unhappy.rs index 297ee92b..6e1a437a 100644 --- a/tests/src/tests/unhappy.rs +++ b/tests/src/tests/unhappy.rs @@ -1,7 +1,7 @@ +use carnot_consensus::CarnotInfo; use carnot_engine::{Block, NodeId, TimeoutQc, View}; use fraction::Fraction; use futures::stream::{self, StreamExt}; -use nomos_consensus::CarnotInfo; use std::{collections::HashSet, time::Duration}; use tests::{adjust_timeout, ConsensusConfig, MixNode, Node, NomosNode, SpawnConfig};