fix naming inconsistencies

Author: ghubertpalo

mithril-aggregator/src/dependency.rs

@@ -116,7 +116,7 @@ pub struct DependencyManager {
     /// Signable Builder Service
     pub signable_builder_service: Arc<dyn SignableBuilderService>,
 
-    /// Artifact Builder Service
+    /// Signed Entity Service
     pub signed_entity_service: Arc<dyn SignedEntityService>,
 
     /// Certifier Service

mithril-aggregator/src/dependency_injection/builder.rs

@@ -170,7 +170,7 @@ pub struct DependenciesBuilder {
     /// Signable Builder Service
     pub signable_builder_service: Option<Arc<dyn SignableBuilderService>>,
 
-    /// Artifact Builder Service
+    /// Signed Entity Service
     pub signed_entity_service: Option<Arc<dyn SignedEntityService>>,
 
     /// Certifier service
@@ -903,7 +903,7 @@ impl DependenciesBuilder {
         Ok(signed_entity_service)
     }
 
-    /// [ArtifactBuilderService] service
+    /// [SignedEntityService] service
     pub async fn get_signed_entity_service(&mut self) -> Result<Arc<dyn SignedEntityService>> {
         if self.signed_entity_service.is_none() {
             self.signed_entity_service = Some(self.build_signed_entity_service().await?);

mithril-aggregator/src/http_server/routes/artifact_routes/mithril_stake_distribution.rs

@@ -52,15 +52,15 @@ pub mod handlers {
         debug!("⇄ HTTP SERVER: artifacts");
 
         match signed_entity_service
-            .get_last_signed_mithril_stake_distribution(LIST_MAX_ITEMS)
+            .get_last_signed_mithril_stake_distributions(LIST_MAX_ITEMS)
             .await
         {
             Ok(signed_entities) => {
                 let messages = ToMithrilStakeDistributionListMessageAdapter::adapt(signed_entities);
                 Ok(reply::json(&messages, StatusCode::OK))
             }
             Err(err) => {
-                warn!("artifacts_mithril_stake_distribution"; "error" => ?err);
+                warn!("list_artifacts_mithril_stake_distribution"; "error" => ?err);
                 Ok(reply::internal_server_error(err.to_string()))
             }
         }
@@ -82,11 +82,11 @@ pub mod handlers {
                 Ok(reply::json(&message, StatusCode::OK))
             }
             Ok(None) => {
-                warn!("mithril_stake_distribution_details::not_found");
+                warn!("get_mithril_stake_distribution_details::not_found");
                 Ok(reply::empty(StatusCode::NOT_FOUND))
             }
             Err(err) => {
-                warn!("mithril_stake_distribution_details::error"; "error" => ?err);
+                warn!("get_mithril_stake_distribution_details::error"; "error" => ?err);
                 Ok(reply::internal_server_error(err.to_string()))
             }
         }
@@ -151,7 +151,7 @@ pub mod tests {
         );
         let mut mock_signed_entity_service = MockSignedEntityService::new();
         mock_signed_entity_service
-            .expect_get_last_signed_mithril_stake_distribution()
+            .expect_get_last_signed_mithril_stake_distributions()
             .return_once(|_| Ok(signed_entity_records))
             .once();
         let mut dependency_manager = initialize_dependencies().await;
@@ -180,7 +180,7 @@ pub mod tests {
     async fn test_mithril_stake_distributions_get_ko() {
         let mut mock_signed_entity_service = MockSignedEntityService::new();
         mock_signed_entity_service
-            .expect_get_last_signed_mithril_stake_distribution()
+            .expect_get_last_signed_mithril_stake_distributions()
             .return_once(|_| Err(HydrationError::InvalidData("invalid data".to_string()).into()))
             .once();
         let mut dependency_manager = initialize_dependencies().await;

mithril-aggregator/src/http_server/routes/artifact_routes/snapshot.rs

@@ -38,7 +38,7 @@ fn artifact_cardano_full_immutable_snapshot_by_id(
         .and_then(handlers::get_artifact_by_signed_entity_id)
 }
 
-/// GET /snapshots/{digest}/download
+/// GET /artifact/snapshots/{digest}/download
 fn snapshot_download(
     dependency_manager: Arc<DependencyManager>,
 ) -> impl Filter<Extract = (impl warp::Reply,), Error = warp::Rejection> + Clone {
@@ -103,7 +103,7 @@ mod handlers {
 
     pub const LIST_MAX_ITEMS: usize = 20;
 
-    /// List Snaptshot artifacts
+    /// List Snapshot artifacts
     pub async fn list_artifacts(
         signed_entity_service: Arc<dyn SignedEntityService>,
     ) -> Result<impl warp::Reply, Infallible> {
@@ -118,7 +118,7 @@ mod handlers {
                 Ok(reply::json(&messages, StatusCode::OK))
             }
             Err(err) => {
-                warn!("artifacts_mithril_stake_distribution"; "error" => ?err);
+                warn!("list_artifacts_snapshot"; "error" => ?err);
                 Ok(reply::internal_server_error(err.to_string()))
             }
         }

mithril-aggregator/src/http_server/routes/middlewares.rs

@@ -81,7 +81,7 @@ pub fn with_ticker_service(
     warp::any().map(move || dependency_manager.ticker_service.clone())
 }
 
-/// With signed entity storer
+/// With signed entity service
 pub fn with_signed_entity_service(
     dependency_manager: Arc<DependencyManager>,
 ) -> impl Filter<Extract = (Arc<dyn SignedEntityService>,), Error = Infallible> + Clone {

mithril-aggregator/src/signed_entity_service.rs

@@ -43,7 +43,7 @@ pub trait SignedEntityService: Send + Sync {
 
     /// Return a list of signed Mithril stake distribution order by creation
     /// date descending.
-    async fn get_last_signed_mithril_stake_distribution(
+    async fn get_last_signed_mithril_stake_distributions(
         &self,
         total: usize,
     ) -> StdResult<Vec<SignedEntity<MithrilStakeDistribution>>>;
@@ -158,7 +158,7 @@ impl SignedEntityService for MithrilSignedEntityService {
         Ok(signed_entities)
     }
 
-    async fn get_last_signed_mithril_stake_distribution(
+    async fn get_last_signed_mithril_stake_distributions(
         &self,
         total: usize,
     ) -> StdResult<Vec<SignedEntity<MithrilStakeDistribution>>> {