refactor(consensus): rename papyrus_consensus_orchestrator package to…

… starknet_
starkware-libs · Jan 15, 2025 · 8d27996 · 8d27996
1 parent 31b374f
commit 8d27996
Show file tree

Hide file tree

Showing 28 changed files with 50 additions and 50 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -12,7 +12,6 @@ members = [
   "crates/papyrus_base_layer",
   "crates/papyrus_common",
   "crates/papyrus_config",
-  "crates/papyrus_consensus_orchestrator",
   "crates/papyrus_execution",
   "crates/papyrus_load_test",
   "crates/papyrus_monitoring_gateway",
@@ -35,6 +34,7 @@ members = [
   "crates/starknet_committer",
   "crates/starknet_consensus",
   "crates/starknet_consensus_manager",
+  "crates/starknet_consensus_orchestrator",
   "crates/starknet_gateway",
   "crates/starknet_gateway_types",
   "crates/starknet_http_server",
@@ -166,7 +166,6 @@ page_size = "0.6.0"
 papyrus_base_layer = { path = "crates/papyrus_base_layer", version = "0.0.0" }
 papyrus_common = { path = "crates/papyrus_common", version = "0.0.0" }
 papyrus_config = { path = "crates/papyrus_config", version = "0.0.0" }
-papyrus_consensus_orchestrator = { path = "crates/papyrus_consensus_orchestrator", version = "0.0.0" }
 papyrus_execution = { path = "crates/papyrus_execution", version = "0.0.0" }
 papyrus_monitoring_gateway = { path = "crates/papyrus_monitoring_gateway", version = "0.0.0" }
 papyrus_network = { path = "crates/papyrus_network", version = "0.0.0" }
@@ -225,6 +224,7 @@ starknet_client = { path = "crates/starknet_client", version = "0.0.0" }
 starknet_committer = { path = "crates/starknet_committer", version = "0.0.0" }
 starknet_consensus = { path = "crates/starknet_consensus", version = "0.0.0" }
 starknet_consensus_manager = { path = "crates/starknet_consensus_manager", version = "0.0.0" }
+starknet_consensus_orchestrator = { path = "crates/starknet_consensus_orchestrator", version = "0.0.0" }
 starknet_gateway = { path = "crates/starknet_gateway", version = "0.0.0" }
 starknet_gateway_types = { path = "crates/starknet_gateway_types", version = "0.0.0" }
 starknet_http_server = { path = "crates/starknet_http_server", version = "0.0.0" }

diff --git a/crates/papyrus_node/Cargo.toml b/crates/papyrus_node/Cargo.toml
@@ -31,7 +31,6 @@ once_cell.workspace = true
 papyrus_base_layer.workspace = true
 papyrus_common.workspace = true
 papyrus_config.workspace = true
-papyrus_consensus_orchestrator.workspace = true
 papyrus_monitoring_gateway.workspace = true
 papyrus_network.workspace = true
 papyrus_p2p_sync.workspace = true
@@ -45,6 +44,7 @@ serde_json = { workspace = true, features = ["arbitrary_precision"] }
 starknet_api = { workspace = true, features = ["testing"] }
 starknet_client.workspace = true
 starknet_consensus.workspace = true
+starknet_consensus_orchestrator.workspace = true
 strum.workspace = true
 tokio = { workspace = true, features = ["full", "sync"] }
 tracing.workspace = true

diff --git a/crates/papyrus_node/src/bin/run_consensus.rs b/crates/papyrus_node/src/bin/run_consensus.rs
@@ -7,7 +7,6 @@
 
 use clap::Parser;
 use futures::stream::StreamExt;
-use papyrus_consensus_orchestrator::papyrus_consensus_context::PapyrusConsensusContext;
 use papyrus_network::gossipsub_impl::Topic;
 use papyrus_network::network_manager::{BroadcastTopicChannels, NetworkManager};
 use papyrus_node::bin_utils::build_configs;
@@ -20,6 +19,7 @@ use starknet_consensus::config::ConsensusConfig;
 use starknet_consensus::simulation_network_receiver::NetworkReceiver;
 use starknet_consensus::stream_handler::StreamHandler;
 use starknet_consensus::types::BroadcastVoteChannel;
+use starknet_consensus_orchestrator::papyrus_consensus_context::PapyrusConsensusContext;
 use tokio::task::JoinHandle;
 
 /// Test configuration for consensus.

diff --git a/crates/papyrus_node/src/run.rs b/crates/papyrus_node/src/run.rs
@@ -13,7 +13,6 @@ use papyrus_common::metrics::COLLECT_PROFILING_METRICS;
 use papyrus_common::pending_classes::PendingClasses;
 use papyrus_config::presentation::get_config_presentation;
 use papyrus_config::validators::config_validate;
-use papyrus_consensus_orchestrator::papyrus_consensus_context::PapyrusConsensusContext;
 use papyrus_monitoring_gateway::MonitoringServer;
 use papyrus_network::gossipsub_impl::Topic;
 use papyrus_network::network_manager::{BroadcastTopicChannels, NetworkManager};
@@ -36,6 +35,7 @@ use starknet_client::reader::objects::pending_data::{PendingBlock, PendingBlockO
 use starknet_client::reader::PendingData;
 use starknet_consensus::config::ConsensusConfig;
 use starknet_consensus::stream_handler::StreamHandler;
+use starknet_consensus_orchestrator::papyrus_consensus_context::PapyrusConsensusContext;
 use tokio::sync::RwLock;
 use tokio::task::JoinHandle;
 use tracing::metadata::LevelFilter;

diff --git a/crates/starknet_consensus_manager/Cargo.toml b/crates/starknet_consensus_manager/Cargo.toml
@@ -11,13 +11,13 @@ workspace = true
 [dependencies]
 async-trait.workspace = true
 papyrus_config.workspace = true
-papyrus_consensus_orchestrator.workspace = true
 papyrus_network.workspace = true
 papyrus_protobuf.workspace = true
 serde.workspace = true
 starknet_api.workspace = true
 starknet_batcher_types.workspace = true
 starknet_consensus.workspace = true
+starknet_consensus_orchestrator.workspace = true
 starknet_infra_utils.workspace = true
 starknet_sequencer_infra.workspace = true
 starknet_state_sync_types.workspace = true

diff --git a/crates/starknet_consensus_manager/src/config.rs b/crates/starknet_consensus_manager/src/config.rs
@@ -2,9 +2,9 @@ use std::collections::BTreeMap;
 
 use papyrus_config::dumping::{append_sub_config_name, SerializeConfig};
 use papyrus_config::{ParamPath, SerializedParam};
-use papyrus_consensus_orchestrator::cende::CendeConfig;
 use serde::{Deserialize, Serialize};
 use starknet_consensus::config::ConsensusConfig;
+use starknet_consensus_orchestrator::cende::CendeConfig;
 use validator::Validate;
 
 /// The consensus manager related configuration.

diff --git a/crates/starknet_consensus_manager/src/consensus_manager.rs b/crates/starknet_consensus_manager/src/consensus_manager.rs
@@ -1,15 +1,15 @@
 use std::sync::Arc;
 
 use async_trait::async_trait;
-use papyrus_consensus_orchestrator::cende::CendeAmbassador;
-use papyrus_consensus_orchestrator::sequencer_consensus_context::SequencerConsensusContext;
 use papyrus_network::gossipsub_impl::Topic;
 use papyrus_network::network_manager::{BroadcastTopicChannels, NetworkManager};
 use papyrus_protobuf::consensus::{HeightAndRound, ProposalPart, StreamMessage, Vote};
 use starknet_api::block::BlockNumber;
 use starknet_batcher_types::communication::SharedBatcherClient;
 use starknet_consensus::stream_handler::StreamHandler;
 use starknet_consensus::types::ConsensusError;
+use starknet_consensus_orchestrator::cende::CendeAmbassador;
+use starknet_consensus_orchestrator::sequencer_consensus_context::SequencerConsensusContext;
 use starknet_infra_utils::type_name::short_type_name;
 use starknet_sequencer_infra::component_definitions::ComponentStarter;
 use starknet_sequencer_infra::errors::ComponentError;

diff --git a/...papyrus_consensus_orchestrator/Cargo.toml → ...tarknet_consensus_orchestrator/Cargo.toml b/...papyrus_consensus_orchestrator/Cargo.toml → ...tarknet_consensus_orchestrator/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "papyrus_consensus_orchestrator"
+name = "starknet_consensus_orchestrator"
 version.workspace = true
 edition.workspace = true
 repository.workspace = true

diff --git a/...or/resources/central_bouncer_weights.json → ...or/resources/central_bouncer_weights.json b/...or/resources/central_bouncer_weights.json → ...or/resources/central_bouncer_weights.json
diff --git a/...strator/resources/central_declare_tx.json → ...strator/resources/central_declare_tx.json b/...strator/resources/central_declare_tx.json → ...strator/resources/central_declare_tx.json
diff --git a/.../resources/central_deploy_account_tx.json → .../resources/central_deploy_account_tx.json b/.../resources/central_deploy_account_tx.json → .../resources/central_deploy_account_tx.json
diff --git a/...estrator/resources/central_invoke_tx.json → ...estrator/resources/central_invoke_tx.json b/...estrator/resources/central_invoke_tx.json → ...estrator/resources/central_invoke_tx.json
diff --git a/...ator/resources/central_l1_handler_tx.json → ...ator/resources/central_l1_handler_tx.json b/...ator/resources/central_l1_handler_tx.json → ...ator/resources/central_l1_handler_tx.json
diff --git a/...strator/resources/central_state_diff.json → ...strator/resources/central_state_diff.json b/...strator/resources/central_state_diff.json → ...strator/resources/central_state_diff.json
diff --git a/...nsus_orchestrator/src/cende/cende_test.rs → ...nsus_orchestrator/src/cende/cende_test.rs b/...nsus_orchestrator/src/cende/cende_test.rs → ...nsus_orchestrator/src/cende/cende_test.rs
diff --git a/...orchestrator/src/cende/central_objects.rs → ...orchestrator/src/cende/central_objects.rs b/...orchestrator/src/cende/central_objects.rs → ...orchestrator/src/cende/central_objects.rs
diff --git a/...strator/src/cende/central_objects_test.rs → ...strator/src/cende/central_objects_test.rs b/...strator/src/cende/central_objects_test.rs → ...strator/src/cende/central_objects_test.rs
diff --git a/...s_consensus_orchestrator/src/cende/mod.rs → ...t_consensus_orchestrator/src/cende/mod.rs b/...s_consensus_orchestrator/src/cende/mod.rs → ...t_consensus_orchestrator/src/cende/mod.rs
diff --git a/...sensus_orchestrator/src/fee_market/mod.rs → ...sensus_orchestrator/src/fee_market/mod.rs b/...sensus_orchestrator/src/fee_market/mod.rs → ...sensus_orchestrator/src/fee_market/mod.rs
diff --git a/...ensus_orchestrator/src/fee_market/test.rs → ...ensus_orchestrator/src/fee_market/test.rs b/...ensus_orchestrator/src/fee_market/test.rs → ...ensus_orchestrator/src/fee_market/test.rs
diff --git a/...papyrus_consensus_orchestrator/src/lib.rs → ...tarknet_consensus_orchestrator/src/lib.rs b/...papyrus_consensus_orchestrator/src/lib.rs → ...tarknet_consensus_orchestrator/src/lib.rs
diff --git a/...estrator/src/papyrus_consensus_context.rs → ...estrator/src/papyrus_consensus_context.rs b/...estrator/src/papyrus_consensus_context.rs → ...estrator/src/papyrus_consensus_context.rs
diff --git a/...tor/src/papyrus_consensus_context_test.rs → ...tor/src/papyrus_consensus_context_test.rs b/...tor/src/papyrus_consensus_context_test.rs → ...tor/src/papyrus_consensus_context_test.rs
diff --git a/...trator/src/sequencer_consensus_context.rs → ...trator/src/sequencer_consensus_context.rs b/...trator/src/sequencer_consensus_context.rs → ...trator/src/sequencer_consensus_context.rs
diff --git a/...r/src/sequencer_consensus_context_test.rs → ...r/src/sequencer_consensus_context_test.rs b/...r/src/sequencer_consensus_context_test.rs → ...r/src/sequencer_consensus_context_test.rs
diff --git a/crates/starknet_integration_tests/Cargo.toml b/crates/starknet_integration_tests/Cargo.toml
@@ -19,7 +19,6 @@ itertools.workspace = true
 mempool_test_utils.workspace = true
 papyrus_common.workspace = true
 papyrus_config.workspace = true
-papyrus_consensus_orchestrator.workspace = true
 papyrus_execution.workspace = true
 papyrus_network = { workspace = true, features = ["testing"] }
 papyrus_protobuf.workspace = true
@@ -32,6 +31,7 @@ starknet_batcher.workspace = true
 starknet_client.workspace = true
 starknet_consensus.workspace = true
 starknet_consensus_manager.workspace = true
+starknet_consensus_orchestrator.workspace = true
 starknet_gateway = { workspace = true, features = ["testing"] }
 starknet_gateway_types.workspace = true
 starknet_http_server = { workspace = true, features = ["testing"] }

diff --git a/crates/starknet_integration_tests/src/utils.rs b/crates/starknet_integration_tests/src/utils.rs
@@ -14,7 +14,6 @@ use mempool_test_utils::starknet_api_test_utils::{
     Contract,
     MultiAccountTransactionGenerator,
 };
-use papyrus_consensus_orchestrator::cende::RECORDER_WRITE_BLOB_PATH;
 use papyrus_network::network_manager::test_utils::create_connected_network_configs;
 use papyrus_network::NetworkConfig;
 use papyrus_storage::StorageConfig;
@@ -28,6 +27,7 @@ use starknet_batcher::config::BatcherConfig;
 use starknet_consensus::config::{ConsensusConfig, TimeoutsConfig};
 use starknet_consensus::types::ValidatorId;
 use starknet_consensus_manager::config::ConsensusManagerConfig;
+use starknet_consensus_orchestrator::cende::RECORDER_WRITE_BLOB_PATH;
 use starknet_gateway::config::{
     GatewayConfig,
     StatefulTransactionValidatorConfig,