Rename consensus service to carnot consensus (#556)

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",

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"] }

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,

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" }

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<CarnotInfo, reqwest::Error> {

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"] }

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,

nomos-services/carnot-consensus/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "nomos-consensus"
+name = "carnot-consensus"
 version = "0.1.0"
 edition = "2021"
 

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 }

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;

simulations/src/node/carnot/messages.rs

@@ -1,7 +1,7 @@
-use carnot_engine::View;
+use carnot_consensus::network::messages::{
-use nomos_consensus::network::messages::{
     NewViewMsg, ProposalMsg, TimeoutMsg, TimeoutQcMsg, VoteMsg,
 };
+use carnot_engine::View;
 
 use crate::network::PayloadSize;
 

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<BTreeMap<String, bool>> = std::sync::OnceLock::new();
 

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" }

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};

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};