diff --git a/Cargo.lock b/Cargo.lock index 5ae347fc2a..83e57f621d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -7306,7 +7306,6 @@ dependencies = [ "starknet-types-core", "starknet_api", "starknet_batcher_types", - "starknet_consensus_manager_types", "test-case", "tokio", "tracing", @@ -10165,11 +10164,11 @@ dependencies = [ "async-trait", "blockifier", "chrono", + "derive_more 0.99.18", "mockall", "papyrus_proc_macros", "serde", "starknet_api", - "starknet_consensus_manager_types", "starknet_mempool_infra", "thiserror", ] @@ -10244,15 +10243,6 @@ dependencies = [ "validator", ] -[[package]] -name = "starknet_consensus_manager_types" -version = "0.0.0" -dependencies = [ - "derive_more 0.99.18", - "serde", - "thiserror", -] - [[package]] name = "starknet_gateway" version = "0.0.0" diff --git a/Cargo.toml b/Cargo.toml index ee814e5622..fb78a40f1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,6 @@ members = [ "crates/blockifier_reexecution", "crates/committer_cli", "crates/consensus_manager", - "crates/consensus_manager_types", "crates/gateway", "crates/gateway_types", "crates/http_server", @@ -210,7 +209,6 @@ starknet_batcher_types = { path = "crates/batcher_types", version = "0.0.0" } starknet_client = { path = "crates/starknet_client", version = "0.0.0" } starknet_committer = { path = "crates/starknet_committer", version = "0.0.0" } starknet_consensus_manager = { path = "crates/consensus_manager", version = "0.0.0" } -starknet_consensus_manager_types = { path = "crates/consensus_manager_types", version = "0.0.0" } starknet_gateway = { path = "crates/gateway", version = "0.0.0" } starknet_gateway_types = { path = "crates/gateway_types", version = "0.0.0" } starknet_http_server = { path = "crates/http_server", version = "0.0.0" } diff --git a/crates/batcher_types/Cargo.toml b/crates/batcher_types/Cargo.toml index 6d12ada85d..88161f5ee1 100644 --- a/crates/batcher_types/Cargo.toml +++ b/crates/batcher_types/Cargo.toml @@ -13,10 +13,10 @@ workspace = true async-trait.workspace = true blockifier.workspace = true chrono = { workspace = true, features = ["serde"] } +derive_more.workspace = true mockall.workspace = true papyrus_proc_macros.workspace = true serde = { workspace = true, features = ["derive"] } starknet_api.workspace = true -starknet_consensus_manager_types.workspace = true starknet_mempool_infra.workspace = true thiserror.workspace = true diff --git a/crates/batcher_types/src/batcher_types.rs b/crates/batcher_types/src/batcher_types.rs index 6eda0f9692..734eb19110 100644 --- a/crates/batcher_types/src/batcher_types.rs +++ b/crates/batcher_types/src/batcher_types.rs @@ -1,13 +1,32 @@ +use std::fmt::Debug; + use blockifier::blockifier::block::BlockNumberHashPair; use chrono::prelude::*; +use derive_more::Display; use serde::{Deserialize, Serialize}; use starknet_api::block::BlockNumber; use starknet_api::core::StateDiffCommitment; use starknet_api::executable_transaction::Transaction; -pub use starknet_consensus_manager_types::consensus_manager_types::ProposalId; use crate::errors::BatcherError; +// TODO (Matan) decide on the id structure +#[derive( + Copy, + Clone, + Debug, + Serialize, + Deserialize, + PartialEq, + Eq, + PartialOrd, + Ord, + Default, + Display, + Hash, +)] +pub struct ProposalId(pub u64); + #[derive(Clone, Debug, Copy, Default, Eq, PartialEq, Serialize, Deserialize)] pub struct ProposalCommitment { pub state_diff_commitment: StateDiffCommitment, diff --git a/crates/consensus_manager_types/Cargo.toml b/crates/consensus_manager_types/Cargo.toml deleted file mode 100644 index 89ae65dfcb..0000000000 --- a/crates/consensus_manager_types/Cargo.toml +++ /dev/null @@ -1,15 +0,0 @@ -[package] -name = "starknet_consensus_manager_types" -version.workspace = true -edition.workspace = true -license.workspace = true -repository.workspace = true - - -[lints] -workspace = true - -[dependencies] -derive_more.workspace = true -serde = { workspace = true, features = ["derive"] } -thiserror.workspace = true diff --git a/crates/consensus_manager_types/src/consensus_manager_types.rs b/crates/consensus_manager_types/src/consensus_manager_types.rs deleted file mode 100644 index 4334efb57f..0000000000 --- a/crates/consensus_manager_types/src/consensus_manager_types.rs +++ /dev/null @@ -1,21 +0,0 @@ -use std::fmt::Debug; - -use derive_more::Display; -use serde::{Deserialize, Serialize}; - -// TODO (Matan) decide on the id structure -#[derive( - Copy, - Clone, - Debug, - Serialize, - Deserialize, - PartialEq, - Eq, - PartialOrd, - Ord, - Default, - Display, - Hash, -)] -pub struct ProposalId(pub u64); diff --git a/crates/consensus_manager_types/src/errors.rs b/crates/consensus_manager_types/src/errors.rs deleted file mode 100644 index 897b893ef4..0000000000 --- a/crates/consensus_manager_types/src/errors.rs +++ /dev/null @@ -1,9 +0,0 @@ -use serde::{Deserialize, Serialize}; -use thiserror::Error; - -// TODO(Tsabary/Matan): Populate with actual errors. -#[derive(Clone, Debug, Error, PartialEq, Eq, Serialize, Deserialize)] -pub enum ConsensusManagerError { - #[error("Placeholder error message")] - Placeholder, -} diff --git a/crates/consensus_manager_types/src/lib.rs b/crates/consensus_manager_types/src/lib.rs deleted file mode 100644 index 76126d52fc..0000000000 --- a/crates/consensus_manager_types/src/lib.rs +++ /dev/null @@ -1,2 +0,0 @@ -pub mod consensus_manager_types; -pub mod errors; diff --git a/crates/sequencing/papyrus_consensus_orchestrator/Cargo.toml b/crates/sequencing/papyrus_consensus_orchestrator/Cargo.toml index 067e8535c2..3d20bfad1e 100644 --- a/crates/sequencing/papyrus_consensus_orchestrator/Cargo.toml +++ b/crates/sequencing/papyrus_consensus_orchestrator/Cargo.toml @@ -17,7 +17,6 @@ papyrus_storage.workspace = true starknet-types-core.workspace = true starknet_api.workspace = true starknet_batcher_types.workspace = true -starknet_consensus_manager_types.workspace = true tokio = { workspace = true, features = ["full"] } tracing.workspace = true diff --git a/crates/sequencing/papyrus_consensus_orchestrator/src/sequencer_consensus_context.rs b/crates/sequencing/papyrus_consensus_orchestrator/src/sequencer_consensus_context.rs index 9216b42e5d..315677bf69 100644 --- a/crates/sequencing/papyrus_consensus_orchestrator/src/sequencer_consensus_context.rs +++ b/crates/sequencing/papyrus_consensus_orchestrator/src/sequencer_consensus_context.rs @@ -28,6 +28,7 @@ use starknet_batcher_types::batcher_types::{ DecisionReachedInput, GetProposalContent, GetProposalContentInput, + ProposalId, ProposalStatus, SendProposalContent, SendProposalContentInput, @@ -35,7 +36,6 @@ use starknet_batcher_types::batcher_types::{ ValidateProposalInput, }; use starknet_batcher_types::communication::BatcherClient; -use starknet_consensus_manager_types::consensus_manager_types::ProposalId; use tracing::{debug, debug_span, error, info, warn, Instrument}; // {height: {proposal_id: (content, [proposal_ids])}}