apollo_storage: add open_storage_with_metric_and_server fn (#10781)

Author: nadin-Starkware

crates/apollo_storage/src/lib.rs

@@ -132,6 +132,7 @@ use mmap_file::{
     Reader,
     Writer,
 };
+use serde::de::DeserializeOwned;
 use serde::{Deserialize, Serialize};
 use starknet_api::block::{BlockHash, BlockNumber, BlockSignature, StarknetVersion};
 use starknet_api::core::{ClassHash, CompiledClassHash, ContractAddress, Nonce};
@@ -163,6 +164,12 @@ use crate::header::StorageBlockHeader;
 use crate::metrics::{register_metrics, STORAGE_COMMIT_LATENCY};
 use crate::mmap_file::MMapFileStats;
 use crate::state::data::IndexedDeprecatedContractClass;
+use crate::storage_reader_server::{
+    create_storage_reader_server,
+    ServerConfig,
+    StorageReaderServer,
+    StorageReaderServerHandler,
+};
 use crate::version::{VersionStorageReader, VersionStorageWriter};
 
 // For more details on the storage version, see the module documentation.
@@ -186,6 +193,24 @@ pub fn open_storage_with_metric(
     open_storage_internal(storage_config, Some(open_readers_metric))
 }
 
+/// Same as [`open_storage_with_metric`], but also creates a storage reader server.
+pub fn open_storage_with_metric_and_server<RequestHandler, Request, Response>(
+    storage_config: StorageConfig,
+    open_readers_metric: &'static MetricGauge,
+    storage_reader_server_config: ServerConfig,
+) -> StorageResult<StorageWithServer<RequestHandler, Request, Response>>
+where
+    RequestHandler: StorageReaderServerHandler<Request, Response>,
+    Request: Serialize + DeserializeOwned + Send + 'static,
+    Response: Serialize + DeserializeOwned + Send + 'static,
+{
+    let (reader, writer) =
+        open_storage_internal(storage_config, Some(open_readers_metric)).expect("");
+    let storage_reader_server =
+        create_storage_reader_server(reader.clone(), storage_reader_server_config);
+    Ok((reader, writer, storage_reader_server))
+}
+
 fn open_storage_internal(
     storage_config: StorageConfig,
     open_readers_metric: Option<&'static MetricGauge>,
@@ -699,6 +724,11 @@ pub enum StorageError {
 /// A type alias that maps to std::result::Result<T, StorageError>.
 pub type StorageResult<V> = std::result::Result<V, StorageError>;
 
+/// A type alias for the return type of storage operations that include an optional storage reader
+/// server.
+pub type StorageWithServer<RequestHandler, Request, Response> =
+    (StorageReader, StorageWriter, Option<StorageReaderServer<RequestHandler, Request, Response>>);
+
 /// A struct for the configuration of the storage.
 #[allow(missing_docs)]
 #[derive(Serialize, Debug, Default, Deserialize, Clone, PartialEq, Validate)]