Merge pull request #1717 from input-output-hk/ensemble/1697/cardano_transaction_with_chain_point_beacon

Add `chain_point` to `TimePoint` structure

Author: Alenar

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "mithril-aggregator"
-version = "0.5.11"
+version = "0.5.12"
 description = "A Mithril Aggregator server"
 authors = { workspace = true }
 edition = { workspace = true }

mithril-aggregator/Cargo.toml

@@ -459,6 +459,7 @@ impl Source for DefaultConfiguration {
 
 #[cfg(test)]
 mod test {
+    use mithril_common::entities::ChainPoint;
     use mithril_common::test_utils::fake_data;
 
     use super::*;
@@ -610,7 +611,8 @@ mod test {
     #[test]
     fn test_list_allowed_signed_entity_types_with_specific_configuration() {
         let beacon = fake_data::beacon();
-        let time_point = TimePoint::new(*beacon.epoch, beacon.immutable_file_number);
+        let chain_point = ChainPoint::dummy();
+        let time_point = TimePoint::new(*beacon.epoch, beacon.immutable_file_number, chain_point);
 
         let config = Configuration {
             network: beacon.network.clone(),

mithril-aggregator/src/configuration.rs

@@ -486,6 +486,7 @@ pub mod tests {
     };
     use async_trait::async_trait;
     use chrono::{DateTime, Utc};
+    use mithril_common::entities::ChainPoint;
     use mithril_common::{
         chain_observer::FakeObserver,
         digesters::DumbImmutableFileObserver,
@@ -607,7 +608,7 @@ pub mod tests {
 
     #[tokio::test]
     async fn test_get_time_point_from_chain() {
-        let expected = TimePoint::new(2, 17);
+        let expected = TimePoint::new(2, 17, ChainPoint::dummy());
         let mut dependencies = initialize_dependencies().await;
         let immutable_file_observer = Arc::new(DumbImmutableFileObserver::default());
         immutable_file_observer

mithril-aggregator/src/runtime/runner.rs

@@ -191,7 +191,8 @@ impl CertificatesHashMigrator {
 #[cfg(test)]
 mod test {
     use mithril_common::entities::{
-        ImmutableFileNumber, SignedEntityType, SignedEntityTypeDiscriminants as Type, TimePoint,
+        ChainPoint, ImmutableFileNumber, SignedEntityType, SignedEntityTypeDiscriminants as Type,
+        TimePoint,
     };
     use mithril_common::test_utils::fake_data;
     use mithril_persistence::sqlite::{ConnectionBuilder, ConnectionOptions, SqliteConnection};
@@ -217,8 +218,10 @@ mod test {
             .unwrap()
     }
 
+    /// Note: If we want to create CardanoTransaction test certificate then another method
+    /// that take a ChainPoint as parameter should be created.
     fn time_at(epoch: u64, immutable_file_number: ImmutableFileNumber) -> TimePoint {
-        TimePoint::new(epoch, immutable_file_number)
+        TimePoint::new(epoch, immutable_file_number, ChainPoint::dummy())
     }
 
     fn dummy_genesis(certificate_hash: &str, time_point: TimePoint) -> Certificate {

mithril-aggregator/src/tools/certificates_hash_migrator.rs

@@ -3,7 +3,7 @@ mod test_extensions;
 use mithril_aggregator::Configuration;
 use mithril_common::{
     entities::{
-        CardanoDbBeacon, Epoch, ProtocolParameters, SignedEntityType,
+        CardanoDbBeacon, ChainPoint, Epoch, ProtocolParameters, SignedEntityType,
         SignedEntityTypeDiscriminants, StakeDistribution, StakeDistributionParty, TimePoint,
     },
     test_utils::MithrilFixtureBuilder,
@@ -22,7 +22,11 @@ async fn certificate_chain() {
         data_stores_directory: get_test_dir("certificate_chain"),
         ..Configuration::new_sample()
     };
-    let mut tester = RuntimeTester::build(TimePoint::new(1, 1), configuration).await;
+    let mut tester = RuntimeTester::build(
+        TimePoint::new(1, 1, ChainPoint::new(10, 1, "block_hash-1")),
+        configuration,
+    )
+    .await;
     let observer = tester.observer.clone();
 
     comment!("Create signers & declare stake distribution");

mithril-aggregator/tests/certificate_chain.rs

@@ -3,7 +3,7 @@ mod test_extensions;
 use mithril_aggregator::Configuration;
 use mithril_common::{
     entities::{
-        CardanoDbBeacon, Epoch, ProtocolParameters, SignedEntityType,
+        CardanoDbBeacon, ChainPoint, Epoch, ProtocolParameters, SignedEntityType,
         SignedEntityTypeDiscriminants, StakeDistributionParty, TimePoint,
     },
     test_utils::MithrilFixtureBuilder,
@@ -22,7 +22,11 @@ async fn create_certificate() {
         data_stores_directory: get_test_dir("create_certificate"),
         ..Configuration::new_sample()
     };
-    let mut tester = RuntimeTester::build(TimePoint::new(1, 1), configuration).await;
+    let mut tester = RuntimeTester::build(
+        TimePoint::new(1, 1, ChainPoint::new(10, 1, "block_hash-1")),
+        configuration,
+    )
+    .await;
 
     comment!("create signers & declare stake distribution");
     let fixture = MithrilFixtureBuilder::default()

mithril-aggregator/tests/create_certificate.rs

@@ -1,7 +1,7 @@
 mod test_extensions;
 use mithril_aggregator::{Configuration, RuntimeError};
 use mithril_common::{
-    entities::{Epoch, ProtocolParameters, TimePoint},
+    entities::{ChainPoint, Epoch, ProtocolParameters, TimePoint},
     era::{EraMarker, SupportedEra},
     test_utils::MithrilFixtureBuilder,
 };
@@ -23,7 +23,11 @@ async fn testing_eras() {
         data_stores_directory: get_test_dir("testing_eras"),
         ..Configuration::new_sample()
     };
-    let mut tester = RuntimeTester::build(TimePoint::new(1, 1), configuration).await;
+    let mut tester = RuntimeTester::build(
+        TimePoint::new(1, 1, ChainPoint::new(10, 1, "block_hash-1")),
+        configuration,
+    )
+    .await;
     tester.era_reader_adapter.set_markers(vec![
         EraMarker::new("unsupported", Some(Epoch(0))),
         EraMarker::new(&SupportedEra::dummy().to_string(), Some(Epoch(12))),

mithril-aggregator/tests/era_checker.rs

@@ -2,7 +2,7 @@ mod test_extensions;
 
 use mithril_aggregator::Configuration;
 use mithril_common::{
-    entities::{CardanoDbBeacon, ProtocolParameters, TimePoint},
+    entities::{CardanoDbBeacon, ChainPoint, ProtocolParameters, TimePoint},
     test_utils::MithrilFixtureBuilder,
 };
 use test_extensions::{utilities::get_test_dir, ExpectedCertificate, RuntimeTester};
@@ -19,7 +19,11 @@ async fn genesis_to_signing() {
         data_stores_directory: get_test_dir("genesis_to_signing"),
         ..Configuration::new_sample()
     };
-    let mut tester = RuntimeTester::build(TimePoint::new(1, 1), configuration).await;
+    let mut tester = RuntimeTester::build(
+        TimePoint::new(1, 1, ChainPoint::new(10, 1, "block_hash-1")),
+        configuration,
+    )
+    .await;
 
     comment!("Create signers & declare stake distribution");
     let fixture = MithrilFixtureBuilder::default()

mithril-aggregator/tests/genesis_to_signing.rs

@@ -5,8 +5,8 @@ use std::time::Duration;
 use mithril_aggregator::Configuration;
 use mithril_common::{
     entities::{
-        CardanoDbBeacon, ProtocolParameters, SignedEntityType, SignedEntityTypeDiscriminants,
-        TimePoint,
+        CardanoDbBeacon, ChainPoint, ProtocolParameters, SignedEntityType,
+        SignedEntityTypeDiscriminants, TimePoint,
     },
     test_utils::MithrilFixtureBuilder,
 };
@@ -24,7 +24,11 @@ async fn open_message_expiration() {
         data_stores_directory: get_test_dir("open_message_expiration"),
         ..Configuration::new_sample()
     };
-    let mut tester = RuntimeTester::build(TimePoint::new(1, 1), configuration).await;
+    let mut tester = RuntimeTester::build(
+        TimePoint::new(1, 1, ChainPoint::new(10, 1, "block_hash-1")),
+        configuration,
+    )
+    .await;
 
     comment!("create signers & declare stake distribution");
     let fixture = MithrilFixtureBuilder::default()