chore: fix conflicts

Signed-off-by: Dori Medini <dori@starkware.co>

Author: dorimedini-starkware

Cargo.lock

@@ -128,7 +128,7 @@ apollo_network.path = "crates/apollo_network"
 apollo_network_types.path = "crates/apollo_network_types"
 apollo_node.path = "crates/apollo_node"
 apollo_p2p_sync.path = "crates/apollo_p2p_sync"
-apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.15.0-rc.2" }
+apollo_proc_macros = { path = "crates/apollo_proc_macros", version = "0.0.0" }
 apollo_proc_macros_tests.path = "crates/apollo_proc_macros_tests"
 apollo_protobuf.path = "crates/apollo_protobuf"
 apollo_reverts.path = "crates/apollo_reverts"

Cargo.toml

@@ -7,7 +7,7 @@ license-file.workspace = true
 description = "A library for handling node configuration."
 
 [dependencies]
-apollo_infra_utils = { workspace = true, optional = true }
+apollo_infra_utils.workspace = true
 clap = { workspace = true, features = ["env", "string"] }
 colored = { workspace = true, optional = true }
 const_format.workspace = true

crates/apollo_config/Cargo.toml

@@ -128,7 +128,7 @@ where
     let mut output = Vec::with_capacity(number_of_items);
     for item in raw.split_whitespace() {
         let value: UrlAndHeaders = serde_json::from_str(item)
-            .map_err(|e| D::Error::custom(format!("Invalid JSON '{}': {}", item, e)))?;
+            .map_err(|e| D::Error::custom(format!("Invalid JSON '{item}': {e}")))?;
         output.push(value);
     }
     Ok(Some(output))
@@ -199,6 +199,6 @@ where
     }
 
     raw.split_whitespace()
-        .map(|s| Url::parse(s).map_err(|e| D::Error::custom(format!("Invalid URL '{}': {}", s, e))))
+        .map(|s| Url::parse(s).map_err(|e| D::Error::custom(format!("Invalid URL '{s}': {e}"))))
         .collect()
 }

crates/apollo_config/src/converters.rs

@@ -298,13 +298,10 @@ async fn is_block_info_valid(
             block_info_proposed,
             block_info_validation,
             format!(
-                "L1 gas price mismatch: expected L1 gas price FRI={}, proposed={}, expected L1 \
-                 data gas price FRI={}, proposed={}, l1_gas_price_margin_percent={}",
-                l1_gas_price_fri,
-                l1_gas_price_fri_proposed,
-                l1_data_gas_price_fri,
-                l1_data_gas_price_fri_proposed,
-                l1_gas_price_margin_percent
+                "L1 gas price mismatch: expected L1 gas price FRI={l1_gas_price_fri}, \
+                 proposed={l1_gas_price_fri_proposed}, expected L1 data gas price \
+                 FRI={l1_data_gas_price_fri}, proposed={l1_data_gas_price_fri_proposed}, \
+                 l1_gas_price_margin_percent={l1_gas_price_margin_percent}"
             ),
         ));
     }

crates/apollo_consensus_orchestrator/src/validate_proposal.rs

@@ -40,7 +40,7 @@ impl ConfigOverride {
         create: bool,
     ) -> ConfigOverrideWithPaths {
         let deployment_path = deployment_config_override_dir.join(DEPLOYMENT_FILE_NAME);
-        let instance_path = deployment_config_override_dir.join(format!("{}.json", instance_name));
+        let instance_path = deployment_config_override_dir.join(format!("{instance_name}.json"));
 
         if create {
             serialize_to_file(

crates/apollo_deployments/src/config_override.rs

@@ -156,13 +156,7 @@ pub(crate) fn build_service_namespace_domain_address(
     namespace: &str,
     domain: &str,
 ) -> String {
-<<<<<<< HEAD
-    format!("{service_name}.{namespace}.{domain}")
-||||||| 3f74dd8a6
-    format!("{}.{}.{}", service_name, namespace, domain)
-=======
-    format!("{}.{}.{}", node_service, namespace, domain)
->>>>>>> origin/main-v0.14.0
+    format!("{node_service}.{namespace}.{domain}")
 }
 
 // TODO(Tsabary): when transitioning runnings nodes in different clusters, this enum should be

crates/apollo_deployments/src/deployment.rs

@@ -105,9 +105,10 @@ fn secrets_config_and_private_parameters_config_schema_compatibility() {
 
     if !(only_in_config.is_empty() && only_in_schema.is_empty()) {
         panic!(
-            "Secrets config override schema mismatch:\nSecrets provided by config: {:?}\nSecrets \
-             required by schema: {:?}\nOnly in config: {:?}\nOnly in schema: {:?}",
-            secrets_provided_by_config, secrets_required_by_schema, only_in_config, only_in_schema
+            "Secrets config override schema mismatch:\nSecrets provided by config: \
+             {secrets_provided_by_config:?}\nSecrets required by schema: \
+             {secrets_required_by_schema:?}\nOnly in config: {only_in_config:?}\nOnly in schema: \
+             {only_in_schema:?}"
         );
     }
 }

crates/apollo_deployments/src/deployment_definitions_test.rs

@@ -29,14 +29,8 @@ use crate::k8s::{
 use crate::service::{GetComponentConfigs, NodeService, ServiceNameInner};
 use crate::utils::{determine_port_numbers, get_secret_key, get_validator_id};
 
-<<<<<<< HEAD
 pub const HYBRID_NODE_REQUIRED_PORTS_NUM: usize = 10;
-||||||| 3f74dd8a6
-pub const HYBRID_NODE_REQUIRED_PORTS_NUM: usize = 9;
-=======
-pub const HYBRID_NODE_REQUIRED_PORTS_NUM: usize = 9;
 pub(crate) const INSTANCE_NAME_FORMAT: Template = Template("hybrid_{}");
->>>>>>> origin/main-v0.14.0
 
 const BASE_PORT: u16 = 55000; // TODO(Tsabary): arbitrary port, need to resolve.
 const CORE_STORAGE: usize = 1000;

crates/apollo_deployments/src/deployments/hybrid.rs

@@ -282,31 +282,7 @@ impl NodeType {
         self.to_string()
     }
 
-<<<<<<< HEAD
-    pub fn add_path_suffix(&self, path: PathBuf, instance_name: &str) -> PathBuf {
-        let deployment_name_dir = path.join(self.get_folder_name());
-        let deployment_with_instance = deployment_name_dir.join(instance_name);
-
-        let s = deployment_with_instance.to_string_lossy();
-        let modified = if s.ends_with('/') { s.into_owned() } else { format!("{s}/") };
-        modified.into()
-    }
-
-    pub fn all_service_names(&self) -> Vec<ServiceName> {
-||||||| 3f74dd8a6
-    pub fn add_path_suffix(&self, path: PathBuf, instance_name: &str) -> PathBuf {
-        let deployment_name_dir = path.join(self.get_folder_name());
-        let deployment_with_instance = deployment_name_dir.join(instance_name);
-
-        let s = deployment_with_instance.to_string_lossy();
-        let modified = if s.ends_with('/') { s.into_owned() } else { format!("{}/", s) };
-        modified.into()
-    }
-
-    pub fn all_service_names(&self) -> Vec<ServiceName> {
-=======
     pub fn all_service_names(&self) -> Vec<NodeService> {
->>>>>>> origin/main-v0.14.0
         match self {
             // TODO(Tsabary): find a way to avoid this code duplication.
             Self::Consolidated => {