Adapt snapshot routes to new location

Author: jpraynaud

mithril-aggregator/src/snapshot_uploaders/local_snapshot_uploader.rs

@@ -37,7 +37,7 @@ impl SnapshotUploader for LocalSnapshotUploader {
 
         let digest = tools::extract_digest_from_path(Path::new(archive_name));
         let location = format!(
-            "{}{}/snapshot/{}/download",
+            "{}{}/artifact/snapshot/{}/download",
             self.snapshot_server_url,
             http_server::SERVER_BASE_PATH,
             digest.unwrap()

mithril-client/src/aggregator.rs

@@ -212,7 +212,7 @@ impl AggregatorHandler for AggregatorHTTPClient {
     /// List snapshots
     async fn list_snapshots(&self) -> Result<Vec<Snapshot>, AggregatorHandlerError> {
         debug!("List snapshots");
-        let url = format!("{}/snapshots", self.aggregator_endpoint);
+        let url = format!("{}/artifact/snapshots", self.aggregator_endpoint);
         let response = self
             .prepare_request_builder(Client::new().get(url.clone()))
             .await
@@ -246,7 +246,7 @@ impl AggregatorHandler for AggregatorHTTPClient {
     /// Get snapshot details
     async fn get_snapshot_details(&self, digest: &str) -> Result<Snapshot, AggregatorHandlerError> {
         debug!("Details snapshot {}", digest);
-        let url = format!("{}/snapshot/{}", self.aggregator_endpoint, digest);
+        let url = format!("{}/artifact/snapshot/{}", self.aggregator_endpoint, digest);
         let response = self
             .prepare_request_builder(Client::new().get(url.clone()))
             .await
@@ -446,7 +446,7 @@ mod tests {
         let (server, config) = setup_test();
         let snapshots_expected = fake_data::snapshots(5);
         let _snapshots_mock = server.mock(|when, then| {
-            when.path("/snapshots");
+            when.path("/artifact/snapshots");
             then.status(200).body(json!(snapshots_expected).to_string());
         });
         let aggregator_client = AggregatorHTTPClient::new(
@@ -463,7 +463,7 @@ mod tests {
     async fn test_list_snapshots_ko_412() {
         let (server, config) = setup_test();
         let _snapshots_mock = server.mock(|when, then| {
-            when.path("/snapshots");
+            when.path("/artifact/snapshots");
             then.status(412).header(
                 MITHRIL_API_VERSION_HEADER,
                 APIVersionProvider::compute_all_versions_sorted()
@@ -488,7 +488,7 @@ mod tests {
     async fn test_list_snapshots_ko_500() {
         let (server, config) = setup_test();
         let _snapshots_mock = server.mock(|when, then| {
-            when.path("/snapshots");
+            when.path("/artifact/snapshots");
             then.status(500);
         });
         let aggregator_client = AggregatorHTTPClient::new(
@@ -518,7 +518,7 @@ mod tests {
         let (server, config) = setup_test();
         let snapshot_expected = fake_data::snapshots(1).first().unwrap().to_owned();
         let _snapshots_mock = server.mock(|when, then| {
-            when.path(format!("/snapshot/{digest}"));
+            when.path(format!("/artifact/snapshot/{digest}"));
             then.status(200).body(json!(snapshot_expected).to_string());
         });
         let aggregator_client = AggregatorHTTPClient::new(
@@ -536,7 +536,7 @@ mod tests {
         let digest = "digest123";
         let (server, config) = setup_test();
         let _snapshots_mock = server.mock(|when, then| {
-            when.path(format!("/snapshot/{digest}"));
+            when.path(format!("/artifact/snapshot/{digest}"));
             then.status(404);
         });
         let aggregator_client = AggregatorHTTPClient::new(
@@ -553,7 +553,7 @@ mod tests {
         let (server, config) = setup_test();
         let digest = "digest123";
         let _snapshots_mock = server.mock(|when, then| {
-            when.path(format!("/snapshot/{digest}"));
+            when.path(format!("/artifact/snapshot/{digest}"));
             then.status(412)
                 .header(MITHRIL_API_VERSION_HEADER, "0.0.999");
         });
@@ -575,7 +575,7 @@ mod tests {
         let digest = "digest123";
         let (server, config) = setup_test();
         let _snapshots_mock = server.mock(|when, then| {
-            when.path(format!("/snapshot/{digest}"));
+            when.path(format!("/artifact/snapshot/{digest}"));
             then.status(500);
         });
         let aggregator_client = AggregatorHTTPClient::new(

mithril-common/src/test_utils/fake_data.rs

@@ -1,8 +1,8 @@
 //! Fake data builders for testing.
 
 use crate::entities::{
-    CertificateMetadata, LotteryIndex, ProtocolMessage, ProtocolMessagePartKey, SignedEntityType,
-    SingleSignatures,
+    CertificateMetadata, Epoch, LotteryIndex, ProtocolMessage, ProtocolMessagePartKey,
+    SignedEntityType, SingleSignatures,
 };
 use crate::{crypto_helper, entities};
 
@@ -185,6 +185,17 @@ pub fn snapshots(total: u64) -> Vec<entities::Snapshot> {
         .collect::<Vec<entities::Snapshot>>()
 }
 
+/// Fake Mithril Stake Distribution
+pub fn mithril_stake_distributions(total: u64) -> Vec<entities::MithrilStakeDistribution> {
+    (1..total + 1)
+        .map(|epoch_idx| entities::MithrilStakeDistribution {
+            epoch: Epoch(epoch_idx),
+            signers_with_stake: self::signers_with_stakes(5),
+            hash: format!("hash-epoch-{epoch_idx}"),
+        })
+        .collect::<Vec<entities::MithrilStakeDistribution>>()
+}
+
 const SIGNERS_WITH_STAKE_JSON: &str = r###"
 [
   {

mithril-test-lab/mithril-end-to-end/src/end_to_end_spec.rs

@@ -241,7 +241,7 @@ async fn update_protocol_parameters(aggregator: &mut Aggregator) -> Result<(), S
 }
 
 async fn assert_node_producing_snapshot(aggregator_endpoint: &str) -> Result<String, String> {
-    let url = format!("{aggregator_endpoint}/snapshots");
+    let url = format!("{aggregator_endpoint}/artifact/snapshots");
     info!("Waiting for the aggregator to produce a snapshot");
 
     // todo: reduce the number of attempts if we can reduce the delay between two immutables
@@ -274,7 +274,7 @@ async fn assert_signer_is_signing_snapshot(
     digest: &str,
     expected_epoch_min: Epoch,
 ) -> Result<String, String> {
-    let url = format!("{aggregator_endpoint}/snapshot/{digest}");
+    let url = format!("{aggregator_endpoint}/artifact/snapshot/{digest}");
     info!(
         "Asserting the aggregator is signing the snapshot message `{}` with an expected min epoch of `{}`",
         digest,