chore: remove consensus manager types

commit-id:1c594540
starkware-libs · Oct 15, 2024 · 9434fe2 · 9434fe2
1 parent cbb215d
commit 9434fe2
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -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
@@ -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
diff --git a/crates/consensus_manager_types/src/consensus_manager_types.rs b/crates/consensus_manager_types/src/consensus_manager_types.rs
diff --git a/crates/consensus_manager_types/src/errors.rs b/crates/consensus_manager_types/src/errors.rs
diff --git a/crates/consensus_manager_types/src/lib.rs b/crates/consensus_manager_types/src/lib.rs
diff --git 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
@@ -28,14 +28,14 @@ use starknet_batcher_types::batcher_types::{
     DecisionReachedInput,
     GetProposalContent,
     GetProposalContentInput,
+    ProposalId,
     ProposalStatus,
     SendProposalContent,
     SendProposalContentInput,
     StartHeightInput,
     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])}}