apollo_storage: split ServerConfig socket into ip and port fields

Author: nadin-Starkware

crates/apollo_deployments/resources/app_configs/batcher_config.json

@@ -52,7 +52,8 @@
   "batcher_config.storage.mmap_file_config.max_object_size": 1073741824,
   "batcher_config.storage.mmap_file_config.max_size": 1099511627776,
   "batcher_config.storage.scope": "StateOnly",
-  "batcher_config.storage_reader_server_config.socket": "0.0.0.0:8080",
+  "batcher_config.storage_reader_server_config.ip": "0.0.0.0",
+  "batcher_config.storage_reader_server_config.port": 8080,
   "batcher_config.storage_reader_server_config.enable": false,
   "batcher_config.propose_l1_txs_every": 10
 }

crates/apollo_deployments/resources/app_configs/replacer_batcher_config.json

@@ -53,6 +53,7 @@
   "batcher_config.storage.mmap_file_config.max_object_size": 1073741824,
   "batcher_config.storage.mmap_file_config.max_size": 1099511627776,
   "batcher_config.storage.scope": "StateOnly",
-  "batcher_config.storage_reader_server_config.socket": "0.0.0.0:8080",
-  "batcher_config.storage_reader_server_config.enable": false
+  "batcher_config.storage_reader_server_config.enable": false,
+  "batcher_config.storage_reader_server_config.ip": "0.0.0.0",
+  "batcher_config.storage_reader_server_config.port": "$$$_BATCHER_CONFIG-STORAGE_READER_SERVER_CONFIG-PORT_$$$"
 }

crates/apollo_node/resources/config_schema.json

@@ -364,10 +364,15 @@
     "privacy": "Public",
     "value": false
   },
-  "batcher_config.storage_reader_server_config.socket": {
-    "description": "The socket address for the storage reader HTTP server.",
+  "batcher_config.storage_reader_server_config.ip": {
+    "description": "The IP address for the storage reader HTTP server.",
     "privacy": "Public",
-    "value": "0.0.0.0:8080"
+    "value": "0.0.0.0"
+  },
+  "batcher_config.storage_reader_server_config.port": {
+    "description": "The port for the storage reader HTTP server.",
+    "privacy": "Public",
+    "value": 8080
   },
   "chain_id": {
     "description": "The chain to follow. For more details see https://docs.starknet.io/documentation/architecture_and_concepts/Blocks/transactions/#chain-id.",

crates/apollo_storage/src/storage_reader_server.rs

@@ -1,7 +1,7 @@
 use std::collections::BTreeMap;
 use std::io;
 use std::marker::PhantomData;
-use std::net::{Ipv4Addr, SocketAddr};
+use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 use apollo_config::dumping::{ser_param, SerializeConfig};
 use apollo_config::{ParamPath, ParamPrivacyInput, SerializedParam};
@@ -24,32 +24,40 @@ mod storage_reader_server_test;
 /// Configuration for the storage reader server.
 #[derive(Clone, Debug, Serialize, Deserialize, PartialEq)]
 pub struct ServerConfig {
-    /// The socket address to bind the server to.
-    pub socket: SocketAddr,
+    /// The socket address for the server.
+    pub ip: IpAddr,
+    /// The port for the server.
+    pub port: u16,
     /// Whether the server is enabled.
     pub enable: bool,
 }
 
 impl ServerConfig {
     /// Creates a new server configuration.
-    pub fn new(socket: SocketAddr, enable: bool) -> Self {
-        Self { socket, enable }
+    pub fn new(ip: Ipv4Addr, port: u16, enable: bool) -> Self {
+        Self { ip: ip.into(), port, enable }
     }
 }
 
 impl Default for ServerConfig {
     fn default() -> Self {
-        Self { socket: (Ipv4Addr::UNSPECIFIED, 8080).into(), enable: false }
+        Self { ip: Ipv4Addr::UNSPECIFIED.into(), port: 8080, enable: false }
     }
 }
 
 impl SerializeConfig for ServerConfig {
     fn dump(&self) -> BTreeMap<ParamPath, SerializedParam> {
         BTreeMap::from_iter([
             ser_param(
-                "socket",
-                &self.socket.to_string(),
-                "The socket address for the storage reader HTTP server.",
+                "ip",
+                &self.ip.to_string(),
+                "The IP address for the storage reader HTTP server.",
+                ParamPrivacyInput::Public,
+            ),
+            ser_param(
+                "port",
+                &self.port,
+                "The port for the storage reader HTTP server.",
                 ParamPrivacyInput::Public,
             ),
             ser_param(
@@ -140,12 +148,13 @@ where
             info!("Storage reader server is disabled, not starting");
             return Ok(());
         }
-        info!("Starting storage reader server on {}", self.config.socket);
+        let socket = SocketAddr::from((self.config.ip, self.config.port));
+        info!("Starting storage reader server on {}", socket);
         let app = self.app();
-        info!("Storage reader server listening on {}", self.config.socket);
+        info!("Storage reader server listening on {}", socket);
 
         // Start the server
-        axum::Server::bind(&self.config.socket).serve(app.into_make_service()).await.map_err(|e| {
+        axum::Server::bind(&socket).serve(app.into_make_service()).await.map_err(|e| {
             error!("Storage reader server error: {}", e);
             StorageError::IOError(io::Error::other(e))
         })

crates/apollo_storage/src/storage_reader_server_test.rs

@@ -1,4 +1,4 @@
-use std::net::{Ipv4Addr, SocketAddr};
+use std::net::Ipv4Addr;
 
 use async_trait::async_trait;
 use axum::body::{Body, Bytes, HttpBody};
@@ -69,8 +69,7 @@ async fn test_endpoint_successful_query() {
         .commit()
         .unwrap();
 
-    let socket = SocketAddr::from((Ipv4Addr::LOCALHOST, 8081));
-    let config = ServerConfig::new(socket, true);
+    let config = ServerConfig::new(Ipv4Addr::LOCALHOST, 8081, true);
 
     let server =
         StorageReaderServer::<TestHandler, TestRequest, TestResponse>::new(reader.clone(), config);
@@ -92,8 +91,7 @@ async fn test_endpoint_successful_query() {
 async fn test_endpoint_query_nonexistent_block() {
     let ((reader, _writer), _temp_dir) = get_test_storage();
 
-    let socket = SocketAddr::from((Ipv4Addr::LOCALHOST, 8082));
-    let config = ServerConfig::new(socket, true);
+    let config = ServerConfig::new(Ipv4Addr::LOCALHOST, 8082, true);
 
     let server =
         StorageReaderServer::<TestHandler, TestRequest, TestResponse>::new(reader.clone(), config);
@@ -128,8 +126,7 @@ async fn send_storage_query<T: Serialize>(app: Router, request: &T) -> Response
 async fn test_endpoint_handler_error() {
     let ((reader, _writer), _temp_dir) = get_test_storage();
 
-    let socket = SocketAddr::from((Ipv4Addr::LOCALHOST, 8083));
-    let config = ServerConfig::new(socket, true);
+    let config = ServerConfig::new(Ipv4Addr::LOCALHOST, 8083, true);
 
     let server =
         StorageReaderServer::<ErrorHandler, TestRequest, TestResponse>::new(reader.clone(), config);
@@ -150,8 +147,7 @@ async fn test_endpoint_handler_error() {
 async fn test_endpoint_invalid_json() {
     let ((reader, _writer), _temp_dir) = get_test_storage();
 
-    let socket = SocketAddr::from((Ipv4Addr::LOCALHOST, 8084));
-    let config = ServerConfig::new(socket, true);
+    let config = ServerConfig::new(Ipv4Addr::LOCALHOST, 8084, true);
 
     let server =
         StorageReaderServer::<TestHandler, TestRequest, TestResponse>::new(reader.clone(), config);