Adapt signer to the addition of the ChainPoint in the TimePoint

Author: Alenar

mithril-signer/src/runtime/runner.rs

@@ -133,16 +133,11 @@ impl Runner for SignerRunner {
     async fn get_current_time_point(&self) -> StdResult<TimePoint> {
         debug!("RUNNER: get_current_time_point");
 
-        let time_point = self
-            .services
+        self.services
             .time_point_provider
             .get_current_time_point()
             .await
-            .with_context(|| "Runner can not get current time point")?;
-        Ok(TimePoint::new(
-            *time_point.epoch,
-            time_point.immutable_file_number,
-        ))
+            .with_context(|| "Runner can not get current time point")
     }
 
     async fn register_signer_to_aggregator(

mithril-signer/src/runtime/signer_services.rs

@@ -354,17 +354,15 @@ pub struct SignerServices {
 
 #[cfg(test)]
 mod tests {
+    use std::path::PathBuf;
+
     use mithril_common::{
-        chain_observer::FakeObserver,
-        digesters::DumbImmutableFileObserver,
-        entities::{Epoch, TimePoint},
+        chain_observer::FakeObserver, digesters::DumbImmutableFileObserver, entities::TimePoint,
         test_utils::TempDir,
     };
 
     use super::*;
 
-    use std::path::PathBuf;
-
     fn get_test_dir(test_name: &str) -> PathBuf {
         TempDir::create("signer_service", test_name)
     }
@@ -379,12 +377,7 @@ mod tests {
 
         assert!(!stores_dir.exists());
         let chain_observer_builder: fn(&Configuration) -> StdResult<ChainObserverService> =
-            |_config| {
-                Ok(Arc::new(FakeObserver::new(Some(TimePoint {
-                    epoch: Epoch(1),
-                    immutable_file_number: 1,
-                }))))
-            };
+            |_config| Ok(Arc::new(FakeObserver::new(Some(TimePoint::dummy()))));
         let immutable_file_observer_builder: fn(
             &Configuration,
         )

mithril-signer/src/runtime/state_machine.rs

@@ -463,14 +463,13 @@ impl StateMachine {
 
 #[cfg(test)]
 mod tests {
-    use mithril_common::{
-        entities::{CardanoDbBeacon, Epoch, ProtocolMessage},
-        test_utils::fake_data,
-    };
+    use mithril_common::entities::{CardanoDbBeacon, ChainPoint, Epoch, ProtocolMessage};
+    use mithril_common::test_utils::fake_data;
 
-    use super::*;
     use crate::runtime::runner::MockSignerRunner;
 
+    use super::*;
+
     fn init_state_machine(init_state: SignerState, runner: MockSignerRunner) -> StateMachine {
         let metrics_service = Arc::new(MetricsService::new().unwrap());
         StateMachine {
@@ -615,6 +614,7 @@ mod tests {
         let time_point = TimePoint {
             immutable_file_number: 99,
             epoch: Epoch(9),
+            chain_point: ChainPoint::dummy(),
         };
         let state = SignerState::Registered {
             epoch: time_point.epoch,
@@ -654,6 +654,7 @@ mod tests {
         let time_point = TimePoint {
             immutable_file_number: 99,
             epoch: Epoch(9),
+            chain_point: ChainPoint::dummy(),
         };
         let state = SignerState::Registered {
             epoch: time_point.epoch,
@@ -713,6 +714,7 @@ mod tests {
         let time_point = TimePoint {
             immutable_file_number: 99,
             epoch: Epoch(9),
+            chain_point: ChainPoint::dummy(),
         };
         let time_point_clone = time_point.clone();
         let beacon = CardanoDbBeacon::new(
@@ -760,6 +762,7 @@ mod tests {
         let time_point = TimePoint {
             immutable_file_number: 99,
             epoch: Epoch(9),
+            chain_point: ChainPoint::dummy(),
         };
         let new_time_point = TimePoint {
             epoch: Epoch(10),
@@ -797,6 +800,7 @@ mod tests {
         let time_point = TimePoint {
             immutable_file_number: 99,
             epoch: Epoch(9),
+            chain_point: ChainPoint::dummy(),
         };
         let time_point_clone = time_point.clone();
         let state = SignerState::Signed {
@@ -834,6 +838,7 @@ mod tests {
         let time_point = TimePoint {
             immutable_file_number: 99,
             epoch: Epoch(9),
+            chain_point: ChainPoint::dummy(),
         };
         let time_point_clone = time_point.clone();
         let state = SignerState::Signed {

mithril-signer/tests/test_extensions/certificate_handler.rs

@@ -127,10 +127,11 @@ impl AggregatorClient for FakeAggregator {
 
 #[cfg(test)]
 mod tests {
-    use mithril_common::{
-        chain_observer::ChainObserver, chain_observer::FakeObserver,
-        digesters::DumbImmutableFileObserver, test_utils::fake_data, CardanoNetwork,
-    };
+    use mithril_common::chain_observer::{ChainObserver, FakeObserver};
+    use mithril_common::digesters::DumbImmutableFileObserver;
+    use mithril_common::entities::ChainPoint;
+    use mithril_common::test_utils::fake_data;
+    use mithril_common::CardanoNetwork;
 
     use super::*;
 
@@ -140,6 +141,7 @@ mod tests {
         let chain_observer = Arc::new(FakeObserver::new(Some(TimePoint {
             epoch: Epoch(1),
             immutable_file_number: 1,
+            chain_point: ChainPoint::dummy(),
         })));
         let time_point_provider = Arc::new(TimePointProviderImpl::new(
             chain_observer.clone(),

mithril-signer/tests/test_extensions/state_machine_tester.rs

@@ -10,7 +10,7 @@ use mithril_common::{
     cardano_block_scanner::DumbBlockScanner,
     chain_observer::{ChainObserver, FakeObserver},
     digesters::{DumbImmutableDigester, DumbImmutableFileObserver, ImmutableFileObserver},
-    entities::{Epoch, SignerWithStake, TimePoint},
+    entities::{ChainPoint, Epoch, SignerWithStake, TimePoint},
     era::{adapters::EraReaderDummyAdapter, EraChecker, EraMarker, EraReader, SupportedEra},
     signable_builder::{
         CardanoImmutableFilesFullSignableBuilder, CardanoTransactionsSignableBuilder,
@@ -98,6 +98,11 @@ impl StateMachineTester {
         let chain_observer = Arc::new(FakeObserver::new(Some(TimePoint {
             epoch: Epoch(1),
             immutable_file_number: 1,
+            chain_point: ChainPoint {
+                slot_number: 1,
+                block_number: 1,
+                block_hash: "block_hash-1".to_string(),
+            },
         })));
         let time_point_provider = Arc::new(TimePointProviderImpl::new(
             chain_observer.clone(),