Replaced redundant calls to format.

linera-io · Nov 11, 2024 · c811bb2 · c811bb2
1 parent 57d8c7b
commit c811bb2
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/linera-rpc/src/grpc/server.rs b/linera-rpc/src/grpc/server.rs
@@ -352,7 +352,7 @@ where
         receiver
             .for_each_concurrent(max_concurrent_tasks, |(cross_chain_request, shard_id)| {
                 let shard = network.shard(shard_id);
-                let remote_address = format!("http://{}", shard.address());
+                let remote_address = shard.http_address();
 
                 let pool = pool.clone();
                 let nickname = nickname.clone();

diff --git a/linera-storage-service/src/client.rs b/linera-storage-service/src/client.rs
@@ -383,7 +383,7 @@ impl AdminKeyValueStore for ServiceStoreClientInternal {
         namespace: &str,
         root_key: &[u8],
     ) -> Result<Self, ServiceStoreError> {
-        let endpoint = format!("http://{}", config.endpoint);
+        let endpoint = config.http_address();
         let endpoint = Endpoint::from_shared(endpoint)?;
         let channel = endpoint.connect_lazy();
         let semaphore = config
@@ -426,7 +426,7 @@ impl AdminKeyValueStore for ServiceStoreClientInternal {
     async fn list_all(config: &Self::Config) -> Result<Vec<String>, ServiceStoreError> {
         let query = RequestListAll {};
         let request = tonic::Request::new(query);
-        let endpoint = format!("http://{}", config.endpoint);
+        let endpoint = config.http_address();
         let endpoint = Endpoint::from_shared(endpoint)?;
         let mut client = StoreProcessorClient::connect(endpoint).await?;
         let response = client.process_list_all(request).await?;
@@ -442,7 +442,7 @@ impl AdminKeyValueStore for ServiceStoreClientInternal {
     async fn delete_all(config: &Self::Config) -> Result<(), ServiceStoreError> {
         let query = RequestDeleteAll {};
         let request = tonic::Request::new(query);
-        let endpoint = format!("http://{}", config.endpoint);
+        let endpoint = config.http_address();
         let endpoint = Endpoint::from_shared(endpoint)?;
         let mut client = StoreProcessorClient::connect(endpoint).await?;
         let _response = client.process_delete_all(request).await?;
@@ -453,7 +453,7 @@ impl AdminKeyValueStore for ServiceStoreClientInternal {
         let namespace = bcs::to_bytes(namespace)?;
         let query = RequestExistsNamespace { namespace };
         let request = tonic::Request::new(query);
-        let endpoint = format!("http://{}", config.endpoint);
+        let endpoint = config.http_address();
         let endpoint = Endpoint::from_shared(endpoint)?;
         let mut client = StoreProcessorClient::connect(endpoint).await?;
         let response = client.process_exists_namespace(request).await?;
@@ -466,7 +466,7 @@ impl AdminKeyValueStore for ServiceStoreClientInternal {
         let namespace = bcs::to_bytes(namespace)?;
         let query = RequestCreateNamespace { namespace };
         let request = tonic::Request::new(query);
-        let endpoint = format!("http://{}", config.endpoint);
+        let endpoint = config.http_address();
         let endpoint = Endpoint::from_shared(endpoint)?;
         let mut client = StoreProcessorClient::connect(endpoint).await?;
         let _response = client.process_create_namespace(request).await?;
@@ -477,7 +477,7 @@ impl AdminKeyValueStore for ServiceStoreClientInternal {
         let namespace = bcs::to_bytes(namespace)?;
         let query = RequestDeleteNamespace { namespace };
         let request = tonic::Request::new(query);
-        let endpoint = format!("http://{}", config.endpoint);
+        let endpoint = config.http_address();
         let endpoint = Endpoint::from_shared(endpoint)?;
         let mut client = StoreProcessorClient::connect(endpoint).await?;
         let _response = client.process_delete_namespace(request).await?;

diff --git a/linera-storage-service/src/common.rs b/linera-storage-service/src/common.rs
@@ -102,11 +102,17 @@ pub(crate) static LRU_STORAGE_SERVICE_METRICS: LazyLock<KeyValueStoreMetrics> =
 #[derive(Debug, Clone)]
 pub struct ServiceStoreConfig {
     /// The endpoint used by the shared store
-    pub endpoint: String,
+    endpoint: String,
     /// The common configuration of the key value store
     pub common_config: CommonStoreConfig,
 }
 
+impl ServiceStoreConfig {
+    pub fn http_address(&self) -> String {
+        format!("http://{}", self.endpoint)
+    }
+}
+
 /// Obtains the binary of the executable.
 /// The path depends whether the test are run in the directory "linera-storage-service"
 /// or in the main directory