diff --git a/Cargo.toml b/Cargo.toml index d428c116..2b549504 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ members = [ "nodes/nomos-node", "nodes/mixnode", "simulations", - "consensus-engine", + "consensus/carnot-engine", "tests", "mixnet/node", "mixnet/client", diff --git a/consensus-engine/Cargo.toml b/consensus/carnot-engine/Cargo.toml similarity index 88% rename from consensus-engine/Cargo.toml rename to consensus/carnot-engine/Cargo.toml index c7147112..324d9e27 100644 --- a/consensus-engine/Cargo.toml +++ b/consensus/carnot-engine/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "consensus-engine" +name = "carnot-engine" version = "0.1.0" edition = "2021" @@ -15,7 +15,7 @@ rand = "0.8" rand_chacha = "0.3" thiserror = "1" fraction = { version = "0.13" } -nomos-utils = { path = "../nomos-utils", optional = true } +nomos-utils = { path = "../../nomos-utils", optional = true } utoipa = { version = "4.0", optional = true } serde_json = { version = "1.0", optional = true } diff --git a/consensus-engine/README.md b/consensus/carnot-engine/README.md similarity index 100% rename from consensus-engine/README.md rename to consensus/carnot-engine/README.md diff --git a/consensus-engine/src/lib.rs b/consensus/carnot-engine/src/lib.rs similarity index 100% rename from consensus-engine/src/lib.rs rename to consensus/carnot-engine/src/lib.rs diff --git a/consensus-engine/src/overlay/branch_overlay.rs b/consensus/carnot-engine/src/overlay/branch_overlay.rs similarity index 100% rename from consensus-engine/src/overlay/branch_overlay.rs rename to consensus/carnot-engine/src/overlay/branch_overlay.rs diff --git a/consensus-engine/src/overlay/flat_overlay.rs b/consensus/carnot-engine/src/overlay/flat_overlay.rs similarity index 100% rename from consensus-engine/src/overlay/flat_overlay.rs rename to consensus/carnot-engine/src/overlay/flat_overlay.rs diff --git a/consensus-engine/src/overlay/leadership.rs b/consensus/carnot-engine/src/overlay/leadership.rs similarity index 100% rename from consensus-engine/src/overlay/leadership.rs rename to consensus/carnot-engine/src/overlay/leadership.rs diff --git a/consensus-engine/src/overlay/membership.rs b/consensus/carnot-engine/src/overlay/membership.rs similarity index 100% rename from consensus-engine/src/overlay/membership.rs rename to consensus/carnot-engine/src/overlay/membership.rs diff --git a/consensus-engine/src/overlay/mod.rs b/consensus/carnot-engine/src/overlay/mod.rs similarity index 100% rename from consensus-engine/src/overlay/mod.rs rename to consensus/carnot-engine/src/overlay/mod.rs diff --git a/consensus-engine/src/overlay/random_beacon.rs b/consensus/carnot-engine/src/overlay/random_beacon.rs similarity index 100% rename from consensus-engine/src/overlay/random_beacon.rs rename to consensus/carnot-engine/src/overlay/random_beacon.rs diff --git a/consensus-engine/src/overlay/threshold.rs b/consensus/carnot-engine/src/overlay/threshold.rs similarity index 100% rename from consensus-engine/src/overlay/threshold.rs rename to consensus/carnot-engine/src/overlay/threshold.rs diff --git a/consensus-engine/src/overlay/tree_overlay/mod.rs b/consensus/carnot-engine/src/overlay/tree_overlay/mod.rs similarity index 100% rename from consensus-engine/src/overlay/tree_overlay/mod.rs rename to consensus/carnot-engine/src/overlay/tree_overlay/mod.rs diff --git a/consensus-engine/src/overlay/tree_overlay/overlay.rs b/consensus/carnot-engine/src/overlay/tree_overlay/overlay.rs similarity index 100% rename from consensus-engine/src/overlay/tree_overlay/overlay.rs rename to consensus/carnot-engine/src/overlay/tree_overlay/overlay.rs diff --git a/consensus-engine/src/overlay/tree_overlay/tree.rs b/consensus/carnot-engine/src/overlay/tree_overlay/tree.rs similarity index 100% rename from consensus-engine/src/overlay/tree_overlay/tree.rs rename to consensus/carnot-engine/src/overlay/tree_overlay/tree.rs diff --git a/consensus-engine/src/types.rs b/consensus/carnot-engine/src/types.rs similarity index 100% rename from consensus-engine/src/types.rs rename to consensus/carnot-engine/src/types.rs diff --git a/consensus-engine/src/types/block_id.rs b/consensus/carnot-engine/src/types/block_id.rs similarity index 100% rename from consensus-engine/src/types/block_id.rs rename to consensus/carnot-engine/src/types/block_id.rs diff --git a/consensus-engine/src/types/committee.rs b/consensus/carnot-engine/src/types/committee.rs similarity index 100% rename from consensus-engine/src/types/committee.rs rename to consensus/carnot-engine/src/types/committee.rs diff --git a/consensus-engine/src/types/node_id.rs b/consensus/carnot-engine/src/types/node_id.rs similarity index 100% rename from consensus-engine/src/types/node_id.rs rename to consensus/carnot-engine/src/types/node_id.rs diff --git a/consensus-engine/src/types/view.rs b/consensus/carnot-engine/src/types/view.rs similarity index 100% rename from consensus-engine/src/types/view.rs rename to consensus/carnot-engine/src/types/view.rs diff --git a/consensus-engine/tests/fuzz/mod.rs b/consensus/carnot-engine/tests/fuzz/mod.rs similarity index 100% rename from consensus-engine/tests/fuzz/mod.rs rename to consensus/carnot-engine/tests/fuzz/mod.rs diff --git a/consensus-engine/tests/fuzz/ref_state.rs b/consensus/carnot-engine/tests/fuzz/ref_state.rs similarity index 99% rename from consensus-engine/tests/fuzz/ref_state.rs rename to consensus/carnot-engine/tests/fuzz/ref_state.rs index ef274e06..71b148f7 100644 --- a/consensus-engine/tests/fuzz/ref_state.rs +++ b/consensus/carnot-engine/tests/fuzz/ref_state.rs @@ -1,6 +1,6 @@ use std::collections::{BTreeMap, HashSet}; -use consensus_engine::{ +use carnot_engine::{ AggregateQc, Block, BlockId, LeaderProof, NodeId, Qc, StandardQc, TimeoutQc, View, }; use proptest::prelude::*; @@ -14,7 +14,7 @@ use crate::fuzz::transition::Transition; // Also, RefState can be used to check invariants of the real state machine in some cases. // // We should try to design this reference state as simple/intuitive as possible, -// so that we don't need to replicate the logic implemented in consensus-engine. +// so that we don't need to replicate the logic implemented in carnot-engine. #[derive(Clone, Debug)] pub struct RefState { pub chain: BTreeMap, diff --git a/consensus-engine/tests/fuzz/sut.rs b/consensus/carnot-engine/tests/fuzz/sut.rs similarity index 98% rename from consensus-engine/tests/fuzz/sut.rs rename to consensus/carnot-engine/tests/fuzz/sut.rs index cd5d0199..0cb2a435 100644 --- a/consensus-engine/tests/fuzz/sut.rs +++ b/consensus/carnot-engine/tests/fuzz/sut.rs @@ -1,7 +1,7 @@ use std::{collections::HashSet, panic}; -use consensus_engine::overlay::FreezeMembership; -use consensus_engine::{ +use carnot_engine::overlay::FreezeMembership; +use carnot_engine::{ overlay::{FlatOverlay, FlatOverlaySettings, RoundRobin}, *, }; diff --git a/consensus-engine/tests/fuzz/transition.rs b/consensus/carnot-engine/tests/fuzz/transition.rs similarity index 90% rename from consensus-engine/tests/fuzz/transition.rs rename to consensus/carnot-engine/tests/fuzz/transition.rs index 2f202801..4ea721dd 100644 --- a/consensus-engine/tests/fuzz/transition.rs +++ b/consensus/carnot-engine/tests/fuzz/transition.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use consensus_engine::{Block, NewView, TimeoutQc}; +use carnot_engine::{Block, NewView, TimeoutQc}; // State transtitions that will be picked randomly #[derive(Clone, Debug)] diff --git a/consensus-engine/tests/fuzz_test.rs b/consensus/carnot-engine/tests/fuzz_test.rs similarity index 100% rename from consensus-engine/tests/fuzz_test.rs rename to consensus/carnot-engine/tests/fuzz_test.rs diff --git a/nodes/nomos-node/Cargo.toml b/nodes/nomos-node/Cargo.toml index 0e2b4ba1..1c5ebbf5 100644 --- a/nodes/nomos-node/Cargo.toml +++ b/nodes/nomos-node/Cargo.toml @@ -32,7 +32,7 @@ nomos-da = { path = "../../nomos-services/data-availability", features = ["libp2 nomos-system-sig = { path = "../../nomos-services/system-sig" } metrics = { path = "../../nomos-services/metrics", optional = true } tracing-subscriber = "0.3" -consensus-engine = { path = "../../consensus-engine" } +carnot-engine = { path = "../../consensus/carnot-engine" } tokio = { version = "1.24", features = ["sync"] } serde_json = "1.0" serde_yaml = "0.9" diff --git a/nodes/nomos-node/src/api.rs b/nodes/nomos-node/src/api.rs index 56a04927..5bcb3a6b 100644 --- a/nodes/nomos-node/src/api.rs +++ b/nodes/nomos-node/src/api.rs @@ -16,7 +16,7 @@ use tower_http::{ use utoipa::OpenApi; use utoipa_swagger_ui::SwaggerUi; -use consensus_engine::BlockId; +use carnot_engine::BlockId; use full_replication::{Blob, Certificate}; use nomos_core::{da::blob, tx::Transaction}; use nomos_mempool::{network::adapters::libp2p::Libp2pAdapter, openapi::Status, MempoolMetrics}; diff --git a/nodes/nomos-node/src/lib.rs b/nodes/nomos-node/src/lib.rs index 6010cdd9..66643704 100644 --- a/nodes/nomos-node/src/lib.rs +++ b/nodes/nomos-node/src/lib.rs @@ -2,8 +2,8 @@ pub mod api; mod config; mod tx; +use carnot_engine::overlay::{RandomBeaconState, RoundRobin, TreeOverlay}; use color_eyre::eyre::Result; -use consensus_engine::overlay::{RandomBeaconState, RoundRobin, TreeOverlay}; use full_replication::Certificate; use full_replication::{AbsoluteNumber, Attestation, Blob, FullReplication}; #[cfg(feature = "metrics")] diff --git a/nomos-cli/Cargo.toml b/nomos-cli/Cargo.toml index cb1e9fbd..e59135ae 100644 --- a/nomos-cli/Cargo.toml +++ b/nomos-cli/Cargo.toml @@ -12,7 +12,7 @@ tracing = "0.1" tracing-subscriber = "0.3" async-trait = "0.1" clap = {version = "4", features = ["derive"] } -consensus-engine = { path = "../consensus-engine" } +carnot-engine = { path = "../consensus/carnot-engine" } serde_yaml = "0.9" futures = "0.3" tokio = { version = "1", features = ["sync"] } diff --git a/nomos-cli/src/api/consensus.rs b/nomos-cli/src/api/consensus.rs index 80bd6a16..2969de50 100644 --- a/nomos-cli/src/api/consensus.rs +++ b/nomos-cli/src/api/consensus.rs @@ -1,5 +1,5 @@ use super::CLIENT; -use consensus_engine::{Block, BlockId}; +use carnot_engine::{Block, BlockId}; use nomos_consensus::CarnotInfo; use reqwest::Url; diff --git a/nomos-cli/src/api/storage.rs b/nomos-cli/src/api/storage.rs index 75286556..cc439600 100644 --- a/nomos-cli/src/api/storage.rs +++ b/nomos-cli/src/api/storage.rs @@ -1,5 +1,5 @@ use super::CLIENT; -use consensus_engine::BlockId; +use carnot_engine::BlockId; use full_replication::Certificate; use nomos_core::block::Block; use nomos_node::Tx; diff --git a/nomos-cli/src/da/retrieve.rs b/nomos-cli/src/da/retrieve.rs index 7aa25314..6723d410 100644 --- a/nomos-cli/src/da/retrieve.rs +++ b/nomos-cli/src/da/retrieve.rs @@ -1,4 +1,4 @@ -use consensus_engine::BlockId; +use carnot_engine::BlockId; use full_replication::Blob; use nomos_core::da::certificate::Certificate; use reqwest::Url; diff --git a/nomos-core/Cargo.toml b/nomos-core/Cargo.toml index 702db6d1..0e1a9f0f 100644 --- a/nomos-core/Cargo.toml +++ b/nomos-core/Cargo.toml @@ -12,7 +12,7 @@ authors = [ async-trait = { version = "0.1" } blake2 = { version = "0.10" } bytes = "1.3" -consensus-engine = { path = "../consensus-engine", features = ["serde"]} +carnot-engine = { path = "../consensus/carnot-engine", features = ["serde"]} futures = "0.3" raptorq = { version = "1.7", optional = true } serde = { version = "1.0", features = ["derive"] } diff --git a/nomos-core/src/block/builder.rs b/nomos-core/src/block/builder.rs index 2d32ac47..508bc8ef 100644 --- a/nomos-core/src/block/builder.rs +++ b/nomos-core/src/block/builder.rs @@ -8,8 +8,8 @@ use crate::block::Block; use crate::da::certificate::BlobCertificateSelect; use crate::da::certificate::Certificate; use crate::tx::{Transaction, TxSelect}; -use consensus_engine::overlay::RandomBeaconState; -use consensus_engine::{NodeId, Qc, View}; +use carnot_engine::overlay::RandomBeaconState; +use carnot_engine::{NodeId, Qc, View}; /// Wrapper over a block building `new` method than holds intermediary state and can be /// passed around. It also compounds the transaction selection and blob selection heuristics to be diff --git a/nomos-core/src/block/mod.rs b/nomos-core/src/block/mod.rs index b88a70e4..e4973c1f 100644 --- a/nomos-core/src/block/mod.rs +++ b/nomos-core/src/block/mod.rs @@ -1,6 +1,6 @@ pub mod builder; -use consensus_engine::overlay::RandomBeaconState; +use carnot_engine::overlay::RandomBeaconState; use indexmap::IndexSet; // std use core::hash::Hash; @@ -11,8 +11,8 @@ use ::serde::{ Deserialize, Serialize, Serializer, }; use bytes::Bytes; -pub use consensus_engine::BlockId; -use consensus_engine::{LeaderProof, NodeId, Qc, View}; +pub use carnot_engine::BlockId; +use carnot_engine::{LeaderProof, NodeId, Qc, View}; // internal pub type TxHash = [u8; 32]; @@ -20,7 +20,7 @@ pub type TxHash = [u8; 32]; /// A block #[derive(Clone, Debug)] pub struct Block { - header: consensus_engine::Block, + header: carnot_engine::Block, beacon: RandomBeaconState, cl_transactions: IndexSet, bl_blobs: IndexSet, @@ -41,7 +41,7 @@ impl< ) -> Self { let transactions = txs.collect(); let blobs = blobs.collect(); - let header = consensus_engine::Block { + let header = carnot_engine::Block { id: BlockId::zeros(), view, parent_qc, @@ -62,7 +62,7 @@ impl< } impl Block { - pub fn header(&self) -> &consensus_engine::Block { + pub fn header(&self) -> &carnot_engine::Block { &self.header } @@ -84,7 +84,7 @@ pub fn block_id_from_wire_content< BlobCertificate: Clone + Eq + Hash + Serialize + DeserializeOwned, >( block: &Block, -) -> consensus_engine::BlockId { +) -> carnot_engine::BlockId { use blake2::digest::{consts::U32, Digest}; use blake2::Blake2b; let bytes = block.as_bytes(); @@ -147,7 +147,7 @@ mod serde { cl_transactions, bl_blobs, } = StrippedBlock::deserialize(deserializer)?; - let header = consensus_engine::Block { + let header = carnot_engine::Block { id: BlockId::zeros(), view: header.view, parent_qc: header.parent_qc, diff --git a/nomos-core/src/vote/mock.rs b/nomos-core/src/vote/mock.rs index 4ae4f9d0..c262ee06 100644 --- a/nomos-core/src/vote/mock.rs +++ b/nomos-core/src/vote/mock.rs @@ -1,6 +1,6 @@ // std // crates -use consensus_engine::{Block, View}; +use carnot_engine::{Block, View}; use futures::{Stream, StreamExt}; use serde::{Deserialize, Serialize}; // internal diff --git a/nomos-services/api/Cargo.toml b/nomos-services/api/Cargo.toml index 3067146a..0d508e83 100644 --- a/nomos-services/api/Cargo.toml +++ b/nomos-services/api/Cargo.toml @@ -13,7 +13,7 @@ overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" overwatch-derive = { git = "https://github.com/logos-co/Overwatch", rev = "ac28d01" } tracing = "0.1" -consensus-engine = { path = "../../consensus-engine" } +carnot-engine = { path = "../../consensus/carnot-engine" } nomos-core = { path = "../../nomos-core" } nomos-consensus = { path = "../../nomos-services/consensus" } nomos-network = { path = "../../nomos-services/network" } diff --git a/nomos-services/api/src/http/consensus.rs b/nomos-services/api/src/http/consensus.rs index 5169a2e8..f02bd885 100644 --- a/nomos-services/api/src/http/consensus.rs +++ b/nomos-services/api/src/http/consensus.rs @@ -4,7 +4,7 @@ use overwatch_rs::overwatch::handle::OverwatchHandle; use serde::{de::DeserializeOwned, Serialize}; use tokio::sync::oneshot; -use consensus_engine::{ +use carnot_engine::{ overlay::{RandomBeaconState, RoundRobin, TreeOverlay}, Block, BlockId, }; diff --git a/nomos-services/api/src/http/storage.rs b/nomos-services/api/src/http/storage.rs index b35c7162..090c09cd 100644 --- a/nomos-services/api/src/http/storage.rs +++ b/nomos-services/api/src/http/storage.rs @@ -1,4 +1,4 @@ -use consensus_engine::BlockId; +use carnot_engine::BlockId; use nomos_core::block::Block; use nomos_storage::{ backends::{sled::SledBackend, StorageSerde}, diff --git a/nomos-services/consensus/Cargo.toml b/nomos-services/consensus/Cargo.toml index 7424dffc..054a9ff0 100644 --- a/nomos-services/consensus/Cargo.toml +++ b/nomos-services/consensus/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" async-trait = "0.1" bytes = "1.3" chrono = "0.4" -consensus-engine = { path = "../../consensus-engine", features = ["serde"] } +carnot-engine = { path = "../../consensus/carnot-engine", features = ["serde"] } futures = "0.3" nomos-network = { path = "../network" } nomos-mempool = { path = "../mempool" } diff --git a/nomos-services/consensus/src/committee_membership/mod.rs b/nomos-services/consensus/src/committee_membership/mod.rs index 1bd6280c..f6c15a4b 100644 --- a/nomos-services/consensus/src/committee_membership/mod.rs +++ b/nomos-services/consensus/src/committee_membership/mod.rs @@ -6,10 +6,10 @@ use std::hash::Hash; // crates // internal -use consensus_engine::overlay::{ +use carnot_engine::overlay::{ CommitteeMembership, Error as RandomBeaconError, FreezeMembership, RandomBeaconState, }; -use consensus_engine::TimeoutQc; +use carnot_engine::TimeoutQc; use nomos_core::block::Block; pub trait UpdateableCommitteeMembership: CommitteeMembership { diff --git a/nomos-services/consensus/src/leader_selection/mod.rs b/nomos-services/consensus/src/leader_selection/mod.rs index 4a3c19ce..759b37e2 100644 --- a/nomos-services/consensus/src/leader_selection/mod.rs +++ b/nomos-services/consensus/src/leader_selection/mod.rs @@ -1,5 +1,5 @@ -use consensus_engine::overlay::RoundRobin; -use consensus_engine::{ +use carnot_engine::overlay::RoundRobin; +use carnot_engine::{ overlay::{Error as RandomBeaconError, LeaderSelection, RandomBeaconState}, TimeoutQc, }; diff --git a/nomos-services/consensus/src/lib.rs b/nomos-services/consensus/src/lib.rs index 26627c4f..fbe2a0ea 100644 --- a/nomos-services/consensus/src/lib.rs +++ b/nomos-services/consensus/src/lib.rs @@ -12,7 +12,7 @@ use std::pin::Pin; use std::time::Duration; // crates use bls_signatures::PrivateKey; -pub use consensus_engine::NodeId; +pub use carnot_engine::NodeId; use futures::{Stream, StreamExt}; use leader_selection::UpdateableLeaderSelection; use serde::Deserialize; @@ -28,7 +28,7 @@ use crate::network::NetworkAdapter; use crate::tally::{ happy::CarnotTally, timeout::TimeoutTally, unhappy::NewViewTally, CarnotTallySettings, }; -use consensus_engine::{ +use carnot_engine::{ overlay::RandomBeaconState, AggregateQc, BlockId, Carnot, Committee, LeaderProof, NewView, Overlay, Payload, Qc, StandardQc, Timeout, TimeoutQc, View, Vote, }; @@ -251,7 +251,7 @@ where } = self.service_state.settings_reader.get_updated_settings(); let overlay = O::new(overlay_settings); - let genesis = consensus_engine::Block { + let genesis = carnot_engine::Block { id: BlockId::zeros(), view: View::new(0), parent_qc: Qc::Standard(StandardQc::genesis()), @@ -351,7 +351,7 @@ where #[derive(Debug)] #[allow(clippy::large_enum_variant)] enum Output { - Send(consensus_engine::Send), + Send(carnot_engine::Send), BroadcastTimeoutQc { timeout_qc: TimeoutQc, }, @@ -866,7 +866,7 @@ where async fn gather_timeout_qc( adapter: A, - view: consensus_engine::View, + view: carnot_engine::View, ) -> Event { if let Some(timeout_qc) = adapter .timeout_qc_stream(view) @@ -885,7 +885,7 @@ where async fn gather_votes( adapter: A, committee: Committee, - block: consensus_engine::Block, + block: carnot_engine::Block, tally: CarnotTallySettings, ) -> Event { let tally = CarnotTally::new(tally); @@ -925,7 +925,7 @@ where async fn gather_timeout( adapter: A, committee: Committee, - view: consensus_engine::View, + view: carnot_engine::View, tally: CarnotTallySettings, ) -> Event { let tally = TimeoutTally::new(tally); @@ -941,7 +941,7 @@ where #[instrument(level = "debug", skip(adapter))] async fn gather_block( adapter: A, - view: consensus_engine::View, + view: carnot_engine::View, ) -> Event { let stream = adapter .proposal_chunks_stream(view) @@ -1011,7 +1011,7 @@ where C: Clone + Eq + Hash + Serialize + DeserializeOwned, { match output { - Output::Send(consensus_engine::Send { to, payload }) => match payload { + Output::Send(carnot_engine::Send { to, payload }) => match payload { Payload::Vote(vote) => { adapter .send( @@ -1076,7 +1076,7 @@ enum Event { #[allow(dead_code)] Approve { qc: Qc, - block: consensus_engine::Block, + block: carnot_engine::Block, votes: HashSet, }, LocalTimeout { @@ -1109,7 +1109,7 @@ pub enum ConsensusMsg { GetBlocks { from: Option, to: Option, - tx: Sender>, + tx: Sender>, }, } @@ -1123,9 +1123,9 @@ pub struct CarnotInfo { pub current_view: View, pub highest_voted_view: View, pub local_high_qc: StandardQc, - pub tip: consensus_engine::Block, + pub tip: carnot_engine::Block, pub last_view_timeout_qc: Option, - pub last_committed_block: consensus_engine::Block, + pub last_committed_block: carnot_engine::Block, } async fn get_mempool_contents( @@ -1160,7 +1160,7 @@ async fn mark_in_block( #[cfg(test)] mod tests { - use consensus_engine::Block; + use carnot_engine::Block; use super::*; diff --git a/nomos-services/consensus/src/network/adapters/libp2p.rs b/nomos-services/consensus/src/network/adapters/libp2p.rs index 8ae95cdb..e9dc5a78 100644 --- a/nomos-services/consensus/src/network/adapters/libp2p.rs +++ b/nomos-services/consensus/src/network/adapters/libp2p.rs @@ -13,7 +13,7 @@ use crate::network::{ messages::{NetworkMessage, ProposalMsg, VoteMsg}, BoxedStream, NetworkAdapter, }; -use consensus_engine::{BlockId, Committee, CommitteeId, View}; +use carnot_engine::{BlockId, Committee, CommitteeId, View}; use nomos_core::wire; use nomos_network::{ backends::libp2p::{Command, Event, EventKind, Libp2p}, diff --git a/nomos-services/consensus/src/network/messages.rs b/nomos-services/consensus/src/network/messages.rs index 6383da05..c464e410 100644 --- a/nomos-services/consensus/src/network/messages.rs +++ b/nomos-services/consensus/src/network/messages.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; // internal use crate::NodeId; -use consensus_engine::{BlockId, NewView, Qc, Timeout, TimeoutQc, View, Vote}; +use carnot_engine::{BlockId, NewView, Qc, Timeout, TimeoutQc, View, Vote}; use nomos_core::wire; #[derive(Clone, Serialize, Deserialize, Debug, Eq, PartialEq, Hash)] diff --git a/nomos-services/consensus/src/network/mod.rs b/nomos-services/consensus/src/network/mod.rs index a8647f9d..db48c1ea 100644 --- a/nomos-services/consensus/src/network/mod.rs +++ b/nomos-services/consensus/src/network/mod.rs @@ -8,7 +8,7 @@ use futures::Stream; use crate::network::messages::{ NetworkMessage, NewViewMsg, ProposalMsg, TimeoutMsg, TimeoutQcMsg, VoteMsg, }; -use consensus_engine::{BlockId, Committee, View}; +use carnot_engine::{BlockId, Committee, View}; use nomos_network::backends::NetworkBackend; use nomos_network::NetworkService; use overwatch_rs::services::relay::OutboundRelay; diff --git a/nomos-services/consensus/src/tally/happy.rs b/nomos-services/consensus/src/tally/happy.rs index 1f53975e..f1322d4b 100644 --- a/nomos-services/consensus/src/tally/happy.rs +++ b/nomos-services/consensus/src/tally/happy.rs @@ -8,7 +8,7 @@ use futures::{Stream, StreamExt}; // internal use super::CarnotTallySettings; use crate::network::messages::VoteMsg; -use consensus_engine::{Block, Qc, StandardQc, Vote}; +use carnot_engine::{Block, Qc, StandardQc, Vote}; use nomos_core::crypto::PublicKey; use nomos_core::vote::Tally; diff --git a/nomos-services/consensus/src/tally/mod.rs b/nomos-services/consensus/src/tally/mod.rs index 81a69a7b..fc71892f 100644 --- a/nomos-services/consensus/src/tally/mod.rs +++ b/nomos-services/consensus/src/tally/mod.rs @@ -8,7 +8,7 @@ pub mod unhappy; use serde::{Deserialize, Serialize}; // internal -use consensus_engine::Committee; +use carnot_engine::Committee; #[derive(Clone, Debug, Serialize, Deserialize)] pub struct CarnotTallySettings { diff --git a/nomos-services/consensus/src/tally/timeout.rs b/nomos-services/consensus/src/tally/timeout.rs index 471c123e..b0ba4096 100644 --- a/nomos-services/consensus/src/tally/timeout.rs +++ b/nomos-services/consensus/src/tally/timeout.rs @@ -5,7 +5,7 @@ use futures::{Stream, StreamExt}; // internal use super::CarnotTallySettings; use crate::network::messages::TimeoutMsg; -use consensus_engine::{Timeout, View}; +use carnot_engine::{Timeout, View}; use nomos_core::vote::Tally; #[derive(Clone, Debug)] diff --git a/nomos-services/consensus/src/tally/unhappy.rs b/nomos-services/consensus/src/tally/unhappy.rs index 0360ae20..08540a6c 100644 --- a/nomos-services/consensus/src/tally/unhappy.rs +++ b/nomos-services/consensus/src/tally/unhappy.rs @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize}; // internal use super::CarnotTallySettings; use crate::network::messages::NewViewMsg; -use consensus_engine::{NewView, TimeoutQc}; +use carnot_engine::{NewView, TimeoutQc}; use nomos_core::vote::Tally; #[derive(thiserror::Error, Debug)] diff --git a/simulations/Cargo.toml b/simulations/Cargo.toml index c0fa9be4..fbbc3225 100644 --- a/simulations/Cargo.toml +++ b/simulations/Cargo.toml @@ -20,7 +20,7 @@ ctrlc = "3.4" chrono = { version = "0.4", features = ["serde"] } crc32fast = "1.3" crossbeam = { version = "0.8.2", features = ["crossbeam-channel"] } -consensus-engine = { path = "../consensus-engine", features = ["simulation"] } +carnot-engine = { path = "../consensus/carnot-engine", features = ["simulation"] } fixed-slice-deque = "0.1.0-beta2" futures = "0.3" humantime = "2.1" diff --git a/simulations/src/bin/app/main.rs b/simulations/src/bin/app/main.rs index 2608b4f5..df0d4a8d 100644 --- a/simulations/src/bin/app/main.rs +++ b/simulations/src/bin/app/main.rs @@ -5,9 +5,9 @@ use std::sync::Arc; use std::time::{Duration, SystemTime, UNIX_EPOCH}; // crates use anyhow::Ok; +use carnot_engine::overlay::RandomBeaconState; +use carnot_engine::{Block, View}; use clap::Parser; -use consensus_engine::overlay::RandomBeaconState; -use consensus_engine::{Block, View}; use crossbeam::channel; use parking_lot::Mutex; use rand::rngs::SmallRng; diff --git a/simulations/src/bin/app/overlay_node.rs b/simulations/src/bin/app/overlay_node.rs index 1103802d..7c296737 100644 --- a/simulations/src/bin/app/overlay_node.rs +++ b/simulations/src/bin/app/overlay_node.rs @@ -1,6 +1,6 @@ -use consensus_engine::overlay::{BranchOverlay, FisherYatesShuffle, RandomBeaconState}; -use consensus_engine::Overlay; -use consensus_engine::{ +use carnot_engine::overlay::{BranchOverlay, FisherYatesShuffle, RandomBeaconState}; +use carnot_engine::Overlay; +use carnot_engine::{ overlay::{FlatOverlay, FreezeMembership, RoundRobin, TreeOverlay}, NodeId, }; @@ -22,7 +22,7 @@ pub fn overlay_info( match &overlay_settings { simulations::settings::OverlaySettings::Flat => { FlatOverlay::::new( - consensus_engine::overlay::FlatOverlaySettings { + carnot_engine::overlay::FlatOverlaySettings { nodes: nodes.to_vec(), leader: RoundRobin::new(), leader_super_majority_threshold: None, @@ -31,7 +31,7 @@ pub fn overlay_info( .info() } simulations::settings::OverlaySettings::Tree(tree_settings) => { - TreeOverlay::new(consensus_engine::overlay::TreeOverlaySettings { + TreeOverlay::new(carnot_engine::overlay::TreeOverlaySettings { nodes, current_leader: leader, number_of_committees: tree_settings.number_of_committees, @@ -42,7 +42,7 @@ pub fn overlay_info( .info() } simulations::settings::OverlaySettings::Branch(branch_settings) => { - BranchOverlay::new(consensus_engine::overlay::BranchOverlaySettings { + BranchOverlay::new(carnot_engine::overlay::BranchOverlaySettings { nodes, current_leader: leader, branch_depth: branch_settings.branch_depth, @@ -73,7 +73,7 @@ pub fn to_overlay_node( }; match &settings.overlay_settings { simulations::settings::OverlaySettings::Flat => { - let overlay_settings = consensus_engine::overlay::FlatOverlaySettings { + let overlay_settings = carnot_engine::overlay::FlatOverlaySettings { nodes: nodes.to_vec(), leader: RoundRobin::new(), leader_super_majority_threshold: None, @@ -94,7 +94,7 @@ pub fn to_overlay_node( ) } simulations::settings::OverlaySettings::Tree(tree_settings) => { - let overlay_settings = consensus_engine::overlay::TreeOverlaySettings { + let overlay_settings = carnot_engine::overlay::TreeOverlaySettings { nodes, current_leader: leader, number_of_committees: tree_settings.number_of_committees, @@ -118,7 +118,7 @@ pub fn to_overlay_node( ) } simulations::settings::OverlaySettings::Branch(branch_settings) => { - let overlay_settings = consensus_engine::overlay::BranchOverlaySettings { + let overlay_settings = carnot_engine::overlay::BranchOverlaySettings { nodes, current_leader: leader, branch_depth: branch_settings.branch_depth, diff --git a/simulations/src/network/regions.rs b/simulations/src/network/regions.rs index 217c6eec..2ca2d360 100644 --- a/simulations/src/network/regions.rs +++ b/simulations/src/network/regions.rs @@ -1,4 +1,4 @@ -use consensus_engine::NodeId; +use carnot_engine::NodeId; // std use rand::{seq::SliceRandom, Rng}; use std::{collections::HashMap, str::FromStr}; @@ -157,7 +157,7 @@ pub fn create_regions( mod tests { use std::collections::HashMap; - use consensus_engine::NodeId; + use carnot_engine::NodeId; use rand::rngs::mock::StepRng; use crate::{ diff --git a/simulations/src/node/carnot/event_builder.rs b/simulations/src/node/carnot/event_builder.rs index 882fe6c1..8803d2fa 100644 --- a/simulations/src/node/carnot/event_builder.rs +++ b/simulations/src/node/carnot/event_builder.rs @@ -1,5 +1,5 @@ use crate::node::carnot::{messages::CarnotMessage, tally::Tally, timeout::TimeoutHandler}; -use consensus_engine::{ +use carnot_engine::{ AggregateQc, Carnot, NewView, Overlay, Qc, StandardQc, Timeout, TimeoutQc, View, Vote, }; use nomos_consensus::network::messages::{NewViewMsg, TimeoutMsg, VoteMsg}; @@ -236,7 +236,7 @@ pub enum Event { #[allow(dead_code)] Approve { qc: Qc, - block: consensus_engine::Block, + block: carnot_engine::Block, votes: HashSet, }, ProposeBlock { diff --git a/simulations/src/node/carnot/message_cache.rs b/simulations/src/node/carnot/message_cache.rs index 602d110f..2544eb5b 100644 --- a/simulations/src/node/carnot/message_cache.rs +++ b/simulations/src/node/carnot/message_cache.rs @@ -1,5 +1,5 @@ use crate::node::carnot::messages::CarnotMessage; -use consensus_engine::View; +use carnot_engine::View; use std::collections::HashMap; pub(crate) struct MessageCache { diff --git a/simulations/src/node/carnot/messages.rs b/simulations/src/node/carnot/messages.rs index 24f8b426..ca42c426 100644 --- a/simulations/src/node/carnot/messages.rs +++ b/simulations/src/node/carnot/messages.rs @@ -1,4 +1,4 @@ -use consensus_engine::View; +use carnot_engine::View; use nomos_consensus::network::messages::{ NewViewMsg, ProposalMsg, TimeoutMsg, TimeoutQcMsg, VoteMsg, }; diff --git a/simulations/src/node/carnot/mod.rs b/simulations/src/node/carnot/mod.rs index 9dc4f091..5b3e228b 100644 --- a/simulations/src/node/carnot/mod.rs +++ b/simulations/src/node/carnot/mod.rs @@ -29,8 +29,8 @@ use crate::output_processors::{Record, RecordType, Runtime}; use crate::settings::SimulationSettings; use crate::streaming::SubscriberFormat; use crate::warding::SimulationState; -use consensus_engine::overlay::RandomBeaconState; -use consensus_engine::{ +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; @@ -67,7 +67,7 @@ impl CarnotSettings { #[allow(dead_code)] // TODO: remove when handling settings pub struct CarnotNode { - id: consensus_engine::NodeId, + id: carnot_engine::NodeId, state: CarnotState, /// A step counter current_step: usize, @@ -87,7 +87,7 @@ impl< > CarnotNode { pub fn new( - id: consensus_engine::NodeId, + id: carnot_engine::NodeId, settings: CarnotSettings, overlay_settings: O::Settings, genesis: nomos_core::block::Block, @@ -122,7 +122,7 @@ impl< fn handle_output(&self, output: Output) { match output { - Output::Send(consensus_engine::Send { + Output::Send(carnot_engine::Send { to, payload: Payload::Vote(vote), }) => { @@ -140,7 +140,7 @@ impl< ); } } - Output::Send(consensus_engine::Send { + Output::Send(carnot_engine::Send { to, payload: Payload::NewView(new_view), }) => { @@ -154,7 +154,7 @@ impl< ); } } - Output::Send(consensus_engine::Send { + Output::Send(carnot_engine::Send { to, payload: Payload::Timeout(timeout), }) => { @@ -226,7 +226,7 @@ impl< "Parent committee of non root committee members should be present", ) }; - output = Some(Output::Send(consensus_engine::Send { + output = Some(Output::Send(carnot_engine::Send { to, payload: Payload::Vote(Vote { view: self.engine.current_view(), @@ -440,7 +440,7 @@ impl< #[derive(Debug)] #[allow(clippy::large_enum_variant)] enum Output { - Send(consensus_engine::Send), + Send(carnot_engine::Send), BroadcastTimeoutQc { timeout_qc: TimeoutQc, }, diff --git a/simulations/src/node/carnot/serde_util.rs b/simulations/src/node/carnot/serde_util.rs index d032acba..49d79e70 100644 --- a/simulations/src/node/carnot/serde_util.rs +++ b/simulations/src/node/carnot/serde_util.rs @@ -10,7 +10,7 @@ use self::{ standard_qc::StandardQcHelper, timeout_qc::TimeoutQcHelper, }; -use consensus_engine::{AggregateQc, Block, BlockId, Committee, Qc, StandardQc, TimeoutQc, View}; +use carnot_engine::{AggregateQc, Block, BlockId, Committee, Qc, StandardQc, TimeoutQc, View}; const NODE_ID: &str = "node_id"; const CURRENT_VIEW: &str = "current_view"; @@ -208,7 +208,7 @@ pub(crate) mod qc { pub(crate) mod timeout_qc { use super::*; - use consensus_engine::NodeId; + use carnot_engine::NodeId; #[derive(Serialize)] pub(crate) struct TimeoutQcHelper<'a> { @@ -238,7 +238,7 @@ pub(crate) mod timeout_qc { } pub(crate) mod serde_id { - use consensus_engine::{BlockId, NodeId}; + use carnot_engine::{BlockId, NodeId}; use super::*; diff --git a/simulations/src/node/carnot/serde_util/csv.rs b/simulations/src/node/carnot/serde_util/csv.rs index 7964eb3b..4088e2f2 100644 --- a/simulations/src/node/carnot/serde_util/csv.rs +++ b/simulations/src/node/carnot/serde_util/csv.rs @@ -4,7 +4,7 @@ use serde_block::BlockHelper; serializer!(CarnotStateCsvSerializer); pub(crate) mod serde_block { - use consensus_engine::LeaderProof; + use carnot_engine::LeaderProof; use super::{qc::QcHelper, *}; diff --git a/simulations/src/node/carnot/serde_util/json.rs b/simulations/src/node/carnot/serde_util/json.rs index 69d361ba..0a3bd8df 100644 --- a/simulations/src/node/carnot/serde_util/json.rs +++ b/simulations/src/node/carnot/serde_util/json.rs @@ -6,7 +6,7 @@ serializer!(CarnotStateJsonSerializer); pub(super) type LocalHighQcHelper<'a> = super::standard_qc::StandardQcHelper<'a>; pub(crate) mod serde_block { - use consensus_engine::LeaderProof; + use carnot_engine::LeaderProof; use super::{qc::QcHelper, *}; diff --git a/simulations/src/node/carnot/tally.rs b/simulations/src/node/carnot/tally.rs index 925bd715..1a2ced66 100644 --- a/simulations/src/node/carnot/tally.rs +++ b/simulations/src/node/carnot/tally.rs @@ -1,4 +1,4 @@ -use consensus_engine::View; +use carnot_engine::View; use std::collections::{HashMap, HashSet}; pub(crate) struct Tally { diff --git a/simulations/src/node/carnot/timeout.rs b/simulations/src/node/carnot/timeout.rs index 0e5683c8..5d6bb12a 100644 --- a/simulations/src/node/carnot/timeout.rs +++ b/simulations/src/node/carnot/timeout.rs @@ -1,4 +1,4 @@ -use consensus_engine::View; +use carnot_engine::View; #[cfg(feature = "polars")] use polars::export::ahash::HashMap; #[cfg(not(feature = "polars"))] diff --git a/simulations/src/node/dummy.rs b/simulations/src/node/dummy.rs index 86d5b9de..b73dff6b 100644 --- a/simulations/src/node/dummy.rs +++ b/simulations/src/node/dummy.rs @@ -1,5 +1,5 @@ // std -use consensus_engine::View; +use carnot_engine::View; use std::collections::{BTreeMap, BTreeSet}; use std::time::Duration; // crates @@ -432,7 +432,7 @@ mod tests { time::{Duration, SystemTime, UNIX_EPOCH}, }; - use consensus_engine::View; + use carnot_engine::View; use crossbeam::channel; use parking_lot::RwLock; use rand::{ diff --git a/simulations/src/node/dummy_streaming.rs b/simulations/src/node/dummy_streaming.rs index 87ccec4d..2caa5dca 100644 --- a/simulations/src/node/dummy_streaming.rs +++ b/simulations/src/node/dummy_streaming.rs @@ -1,4 +1,4 @@ -use consensus_engine::View; +use carnot_engine::View; use serde::{Deserialize, Serialize}; use std::time::Duration; diff --git a/simulations/src/node/mod.rs b/simulations/src/node/mod.rs index f3aa38e2..a5883908 100644 --- a/simulations/src/node/mod.rs +++ b/simulations/src/node/mod.rs @@ -5,7 +5,7 @@ pub mod dummy; pub mod dummy_streaming; // std -use consensus_engine::View; +use carnot_engine::View; use std::{ collections::BTreeMap, ops::{Deref, DerefMut}, @@ -18,7 +18,7 @@ use serde::{Deserialize, Serialize}; // internal use crate::overlay::tests::{Layout, OverlaySettings, SimulationOverlay}; -pub use consensus_engine::NodeId; +pub use carnot_engine::NodeId; #[derive(Copy, Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, Serialize, Deserialize)] #[serde(transparent)] diff --git a/simulations/src/overlay/overlay_info.rs b/simulations/src/overlay/overlay_info.rs index f3c4870d..5afc1e4b 100644 --- a/simulations/src/overlay/overlay_info.rs +++ b/simulations/src/overlay/overlay_info.rs @@ -1,4 +1,4 @@ -use consensus_engine::{CommitteeId, NodeId, Overlay}; +use carnot_engine::{CommitteeId, NodeId, Overlay}; use serde::Serialize; use std::collections::{BTreeSet, HashMap, VecDeque}; @@ -58,7 +58,7 @@ impl OverlayInfoExt for T { #[cfg(test)] mod tests { - use consensus_engine::{ + use carnot_engine::{ overlay::{ BranchOverlay, BranchOverlaySettings, FisherYatesShuffle, RoundRobin, TreeOverlay, TreeOverlaySettings, diff --git a/simulations/src/overlay/tests/flat.rs b/simulations/src/overlay/tests/flat.rs index 9028efe8..4be8e2c5 100644 --- a/simulations/src/overlay/tests/flat.rs +++ b/simulations/src/overlay/tests/flat.rs @@ -1,4 +1,4 @@ -use consensus_engine::NodeId; +use carnot_engine::NodeId; // std // crates use rand::prelude::IteratorRandom; diff --git a/simulations/src/overlay/tests/tree.rs b/simulations/src/overlay/tests/tree.rs index f8721959..ca414888 100644 --- a/simulations/src/overlay/tests/tree.rs +++ b/simulations/src/overlay/tests/tree.rs @@ -1,5 +1,5 @@ // std -use consensus_engine::NodeId; +use carnot_engine::NodeId; use std::collections::HashMap; // crates use rand::seq::IteratorRandom; diff --git a/simulations/src/runner/sync_runner.rs b/simulations/src/runner/sync_runner.rs index 2879e97a..6a7d8080 100644 --- a/simulations/src/runner/sync_runner.rs +++ b/simulations/src/runner/sync_runner.rs @@ -83,7 +83,7 @@ mod tests { settings::SimulationSettings, streaming::StreamProducer, }; - use consensus_engine::View; + use carnot_engine::View; use crossbeam::channel; use parking_lot::RwLock; use rand::rngs::mock::StepRng; diff --git a/simulations/src/streaming/io.rs b/simulations/src/streaming/io.rs index 9332731b..e987aa0e 100644 --- a/simulations/src/streaming/io.rs +++ b/simulations/src/streaming/io.rs @@ -117,7 +117,7 @@ where mod tests { use std::{collections::HashMap, time::Duration}; - use consensus_engine::View; + use carnot_engine::View; use crate::{ network::{ diff --git a/simulations/src/streaming/naive.rs b/simulations/src/streaming/naive.rs index 6b118ce6..4afd6206 100644 --- a/simulations/src/streaming/naive.rs +++ b/simulations/src/streaming/naive.rs @@ -196,7 +196,7 @@ fn write_csv_record( mod tests { use std::{collections::HashMap, time::Duration}; - use consensus_engine::View; + use carnot_engine::View; use crate::{ network::{ diff --git a/simulations/src/streaming/runtime_subscriber.rs b/simulations/src/streaming/runtime_subscriber.rs index f4c36bec..5aa2f75f 100644 --- a/simulations/src/streaming/runtime_subscriber.rs +++ b/simulations/src/streaming/runtime_subscriber.rs @@ -103,7 +103,7 @@ where mod tests { use std::{collections::HashMap, time::Duration}; - use consensus_engine::View; + use carnot_engine::View; use crate::{ network::{ diff --git a/simulations/src/streaming/settings_subscriber.rs b/simulations/src/streaming/settings_subscriber.rs index 2d3aa07c..c6a530ea 100644 --- a/simulations/src/streaming/settings_subscriber.rs +++ b/simulations/src/streaming/settings_subscriber.rs @@ -103,7 +103,7 @@ where mod tests { use std::{collections::HashMap, time::Duration}; - use consensus_engine::View; + use carnot_engine::View; use crate::{ network::{ diff --git a/simulations/src/warding/minmax.rs b/simulations/src/warding/minmax.rs index c1926585..8e7e74d7 100644 --- a/simulations/src/warding/minmax.rs +++ b/simulations/src/warding/minmax.rs @@ -1,5 +1,5 @@ use crate::warding::{SimulationState, SimulationWard}; -use consensus_engine::View; +use carnot_engine::View; use serde::{Deserialize, Serialize}; /// MinMaxView. It monitors the gap between a min view and max view, triggers when surpassing @@ -29,7 +29,7 @@ impl SimulationWard for MinMaxViewWard { mod test { use crate::warding::minmax::MinMaxViewWard; use crate::warding::{SimulationState, SimulationWard}; - use consensus_engine::View; + use carnot_engine::View; use parking_lot::RwLock; use std::sync::Arc; diff --git a/simulations/src/warding/ttf.rs b/simulations/src/warding/ttf.rs index 6a781d6c..21221dc9 100644 --- a/simulations/src/warding/ttf.rs +++ b/simulations/src/warding/ttf.rs @@ -1,5 +1,5 @@ use crate::warding::{SimulationState, SimulationWard}; -use consensus_engine::View; +use carnot_engine::View; use serde::{Deserialize, Serialize}; /// Time to finality ward. It monitors the amount of rounds of the simulations, triggers when surpassing @@ -25,7 +25,7 @@ impl SimulationWard for MaxViewWard { mod test { use crate::warding::ttf::MaxViewWard; use crate::warding::{SimulationState, SimulationWard}; - use consensus_engine::View; + use carnot_engine::View; use parking_lot::RwLock; use std::sync::Arc; diff --git a/tests/Cargo.toml b/tests/Cargo.toml index 9142fd6b..cae6b998 100644 --- a/tests/Cargo.toml +++ b/tests/Cargo.toml @@ -12,7 +12,7 @@ nomos-log = { path = "../nomos-services/log" } nomos-api = { path = "../nomos-services/api" } overwatch-rs = { git = "https://github.com/logos-co/Overwatch", rev = "2f70806" } nomos-core = { path = "../nomos-core" } -consensus-engine = { path = "../consensus-engine", features = ["serde"] } +carnot-engine = { path = "../consensus/carnot-engine", features = ["serde"] } nomos-mempool = { path = "../nomos-services/mempool", features = ["mock", "libp2p"] } nomos-da = { path = "../nomos-services/data-availability" } full-replication = { path = "../nomos-da/full-replication" } diff --git a/tests/src/nodes/nomos.rs b/tests/src/nodes/nomos.rs index a0a90762..ef3e4f47 100644 --- a/tests/src/nodes/nomos.rs +++ b/tests/src/nodes/nomos.rs @@ -4,8 +4,8 @@ use std::process::{Child, Command, Stdio}; use std::time::Duration; // internal use crate::{adjust_timeout, get_available_port, ConsensusConfig, MixnetConfig, Node, SpawnConfig}; -use consensus_engine::overlay::{RandomBeaconState, RoundRobin, TreeOverlay, TreeOverlaySettings}; -use consensus_engine::{BlockId, NodeId, Overlay}; +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; @@ -151,7 +151,7 @@ impl NomosNode { &self, from: Option, to: Option, - ) -> Vec { + ) -> Vec { let mut req = CLIENT.get(format!("http://{}/{}", self.addr, GET_BLOCKS_INFO)); if let Some(from) = from { @@ -165,7 +165,7 @@ impl NomosNode { req.send() .await .unwrap() - .json::>() + .json::>() .await .unwrap() } diff --git a/tests/src/tests/happy.rs b/tests/src/tests/happy.rs index bd7be3b6..133d2b10 100644 --- a/tests/src/tests/happy.rs +++ b/tests/src/tests/happy.rs @@ -1,4 +1,4 @@ -use consensus_engine::{Qc, View}; +use carnot_engine::{Qc, View}; use futures::stream::{self, StreamExt}; use std::collections::HashSet; use std::time::Duration; diff --git a/tests/src/tests/unhappy.rs b/tests/src/tests/unhappy.rs index 2c4eb787..297ee92b 100644 --- a/tests/src/tests/unhappy.rs +++ b/tests/src/tests/unhappy.rs @@ -1,4 +1,4 @@ -use consensus_engine::{Block, NodeId, TimeoutQc, View}; +use carnot_engine::{Block, NodeId, TimeoutQc, View}; use fraction::Fraction; use futures::stream::{self, StreamExt}; use nomos_consensus::CarnotInfo;