Avoid Noop

golemcloud · Jul 2, 2024 · e354527 · e354527
1 parent 95d8efc
commit e354527
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 30 deletions.
diff --git a/golem-worker-service-base/src/evaluator/component_elements.rs b/golem-worker-service-base/src/evaluator/component_elements.rs
@@ -102,7 +102,7 @@ impl DefaultComponentElementsFetch {
                 let worker_id = worker_id.clone();
                 Box::pin(async move {
                     component_metadata_service
-                        .get_active_component_in_worker(&worker_id)
+                        .get_worker_component_version(&worker_id)
                         .await
                 })
             })

diff --git a/golem-worker-service-base/src/evaluator/component_metadata_fetch.rs b/golem-worker-service-base/src/evaluator/component_metadata_fetch.rs
@@ -17,7 +17,7 @@ pub trait ComponentMetadataService {
         version: ComponentVersion,
     ) -> Result<ComponentDetails, MetadataFetchError>;
 
-    async fn get_active_component_in_worker(
+    async fn get_worker_component_version(
         &self,
         worker_id: &WorkerId,
     ) -> Result<ComponentVersion, MetadataFetchError>;
@@ -43,29 +43,3 @@ impl Display for MetadataFetchError {
     }
 }
 
-pub struct NoopComponentMetadataService;
-
-#[async_trait]
-impl ComponentMetadataService for NoopComponentMetadataService {
-    async fn get_latest_component_metadata(
-        &self,
-        _component_id: &ComponentId,
-    ) -> Result<ComponentDetails, MetadataFetchError> {
-        Err(MetadataFetchError::Internal("Not implemented".to_string()))
-    }
-
-    async fn get_component_metadata(
-        &self,
-        _component_id: &ComponentId,
-        _version: ComponentVersion,
-    ) -> Result<ComponentDetails, MetadataFetchError> {
-        Err(MetadataFetchError::Internal("Not implemented".to_string()))
-    }
-
-    async fn get_active_component_in_worker(
-        &self,
-        _worker_id: &WorkerId,
-    ) -> Result<ComponentVersion, MetadataFetchError> {
-        Err(MetadataFetchError::Internal("Not implemented".to_string()))
-    }
-}
diff --git a/golem-worker-service-base/src/http/http_request.rs b/golem-worker-service-base/src/http/http_request.rs
@@ -269,7 +269,7 @@ mod tests {
             self.get_latest_component_metadata(component_id).await
         }
 
-        async fn get_active_component_in_worker(
+        async fn get_worker_component_version(
             &self,
             _worker_id: &WorkerId,
         ) -> Result<ComponentVersion, MetadataFetchError> {

diff --git a/golem-worker-service/src/component_metadata_fetcher.rs b/golem-worker-service/src/component_metadata_fetcher.rs
@@ -58,7 +58,7 @@ impl ComponentMetadataService for DefaultComponentMetadataFetch {
             .map_err(|e| MetadataFetchError::Internal(e.to_string()))
     }
 
-    async fn get_active_component_in_worker(
+    async fn get_worker_component_version(
         &self,
         worker_id: &WorkerId,
     ) -> Result<ComponentVersion, MetadataFetchError> {