Adapt client, client-cli and end-to-end to the ChainPoint beacon

Author: Alenar

mithril-client-cli/src/commands/cardano_transaction/snapshot_list.rs

@@ -31,9 +31,10 @@ impl CardanoTransactionSnapshotListCommand {
                 .into_iter()
                 .map(|item| {
                     vec![
-                        format!("{}", item.beacon.epoch).cell(),
-                        format!("{}", item.beacon.immutable_file_number).cell(),
-                        item.beacon.network.cell(),
+                        format!("{}", item.epoch).cell(),
+                        format!("{}", item.chain_point.block_number).cell(),
+                        format!("{}", item.chain_point.slot_number).cell(),
+                        item.chain_point.block_hash.cell(),
                         item.hash.cell(),
                         item.certificate_hash.cell(),
                         item.created_at.to_string().cell(),
@@ -43,8 +44,9 @@ impl CardanoTransactionSnapshotListCommand {
                 .table()
                 .title(vec![
                     "Epoch".cell(),
-                    "Immutable".cell(),
-                    "Network".cell(),
+                    "Block Number".cell(),
+                    "Slot Number".cell(),
+                    "Block Hash".cell(),
                     "Hash".cell(),
                     "Certificate Hash".cell(),
                     "Created".cell().justify(Justify::Right),

mithril-client-cli/src/commands/cardano_transaction/snapshot_show.rs

@@ -60,12 +60,16 @@ impl CardanoTransactionsSnapshotShowCommand {
             println!("{}", serde_json::to_string(&tx_sets)?);
         } else {
             let transaction_sets_table = vec![
-                vec!["Epoch".cell(), format!("{}", &tx_sets.beacon.epoch).cell()],
+                vec!["Epoch".cell(), format!("{}", &tx_sets.epoch).cell()],
                 vec![
-                    "Immutable File Number".cell(),
-                    format!("{}", &tx_sets.beacon.immutable_file_number).cell(),
+                    "Block Number".cell(),
+                    format!("{}", &tx_sets.chain_point.block_number).cell(),
                 ],
-                vec!["Network".cell(), tx_sets.beacon.network.cell()],
+                vec![
+                    "Slot Number".cell(),
+                    format!("{}", &tx_sets.chain_point.slot_number).cell(),
+                ],
+                vec!["Block Hash".cell(), tx_sets.chain_point.block_hash.cell()],
                 vec!["Merkle Root".cell(), tx_sets.merkle_root.to_string().cell()],
                 vec![
                     "Certificate Hash".cell(),

mithril-client/src/cardano_transaction_client.rs

@@ -159,13 +159,14 @@ impl CardanoTransactionClient {
 #[cfg(test)]
 mod tests {
     use crate::aggregator_client::{AggregatorClientError, MockAggregatorHTTPClient};
-    use crate::common::CardanoDbBeacon;
+    use crate::common::{ChainPoint, Epoch};
     use crate::{
         CardanoTransactionSnapshot, CardanoTransactionSnapshotListItem, CardanoTransactionsProofs,
         CardanoTransactionsSetProof,
     };
     use anyhow::anyhow;
     use chrono::{DateTime, Utc};
+    use mockall::predicate::eq;
     use std::sync::Arc;
 
     use super::*;
@@ -174,7 +175,8 @@ mod tests {
         vec![
             CardanoTransactionSnapshotListItem {
                 merkle_root: "mk-123".to_string(),
-                beacon: CardanoDbBeacon::new("network".to_string(), 1, 1),
+                epoch: Epoch(1),
+                chain_point: ChainPoint::new(100, 24, "block_hash-24"),
                 hash: "hash-123".to_string(),
                 certificate_hash: "cert-hash-123".to_string(),
                 created_at: DateTime::parse_from_rfc3339("2023-01-19T13:43:05.618857482Z")
@@ -183,7 +185,8 @@ mod tests {
             },
             CardanoTransactionSnapshotListItem {
                 merkle_root: "mk-456".to_string(),
-                beacon: CardanoDbBeacon::new("network".to_string(), 1, 2),
+                epoch: Epoch(1),
+                chain_point: ChainPoint::new(100, 24, "block_hash-24"),
                 hash: "hash-456".to_string(),
                 certificate_hash: "cert-hash-456".to_string(),
                 created_at: DateTime::parse_from_rfc3339("2023-01-19T13:43:05.618857482Z")
@@ -213,7 +216,8 @@ mod tests {
         let mut http_client = MockAggregatorHTTPClient::new();
         let message = CardanoTransactionSnapshot {
             merkle_root: "mk-123".to_string(),
-            beacon: CardanoDbBeacon::new("network".to_string(), 1, 1),
+            epoch: Epoch(1),
+            chain_point: ChainPoint::new(100, 24, "block_hash-24"),
             hash: "hash-123".to_string(),
             certificate_hash: "cert-hash-123".to_string(),
             created_at: DateTime::parse_from_rfc3339("2023-01-19T13:43:05.618857482Z")
@@ -223,10 +227,13 @@ mod tests {
         let expected = message.clone();
         http_client
             .expect_get_content()
+            .with(eq(AggregatorRequest::GetCardanoTransactionSnapshot {
+                hash: "hash-123".to_string(),
+            }))
             .return_once(move |_| Ok(serde_json::to_string(&message).unwrap()));
         let client = CardanoTransactionClient::new(Arc::new(http_client));
         let cardano_transaction_snapshot = client
-            .get_snapshot("hash")
+            .get_snapshot("hash-123")
             .await
             .unwrap()
             .expect("This test returns a cardano transaction snapshot");

mithril-client/src/type_alias.rs

@@ -61,6 +61,6 @@ pub mod common {
         ProtocolParameters,
     };
     cfg_unstable! {
-        pub use mithril_common::entities::TransactionHash;
+        pub use mithril_common::entities::{ChainPoint, TransactionHash};
     }
 }

mithril-client/tests/extensions/fake.rs

@@ -165,7 +165,7 @@ mod proof {
                         .unwrap(),
                 }],
                 non_certified_transactions: vec![],
-                latest_immutable_file_number: 9999,
+                latest_block_number: 9999,
             })
             .unwrap();
 

mithril-test-lab/mithril-end-to-end/src/assertions/check.rs

@@ -212,7 +212,7 @@ pub async fn assert_signer_is_signing_cardano_transactions(
         match reqwest::get(url.clone()).await {
             Ok(response) => match response.status() {
                 StatusCode::OK => match response.json::<CardanoTransactionSnapshotMessage>().await {
-                    Ok(artifact) => match artifact.beacon.epoch {
+                    Ok(artifact) => match artifact.epoch {
                         epoch if epoch >= expected_epoch_min => Ok(Some(artifact)),
                         epoch => Err(anyhow!(
                             "Minimum expected artifact epoch not reached : {epoch} < {expected_epoch_min}"