Use new BlockNumber type in mithril-signer

Aggregator still doesn't compile.

Author: Alenar

mithril-signer/src/cardano_transactions_importer.rs

@@ -132,8 +132,8 @@ impl Configuration {
             db_directory: PathBuf::new(),
             network: "devnet".to_string(),
             network_magic: Some(42),
-            network_security_parameter: 2160,
-            preload_security_parameter: 30,
+            network_security_parameter: BlockNumber(2160),
+            preload_security_parameter: BlockNumber(30),
             party_id: Some(party_id),
             run_interval: 5000,
             data_stores_directory: PathBuf::new(),
@@ -151,7 +151,7 @@ impl Configuration {
             metrics_server_port: 9090,
             allow_unparsable_block: false,
             enable_transaction_pruning: false,
-            transactions_import_block_chunk_size: 1000,
+            transactions_import_block_chunk_size: BlockNumber(1000),
             cardano_transactions_block_streamer_max_roll_forwards_per_poll: 1000,
         }
     }
@@ -215,16 +215,16 @@ pub struct DefaultConfiguration {
     pub metrics_server_port: u16,
 
     /// Network security parameter
-    pub network_security_parameter: BlockNumber,
+    pub network_security_parameter: u64,
 
     /// Transaction pruning toggle
     pub enable_transaction_pruning: bool,
 
     /// Preload security parameter
-    pub preload_security_parameter: BlockNumber,
+    pub preload_security_parameter: u64,
 
     /// Chunk size for importing transactions
-    pub transactions_import_block_chunk_size: BlockNumber,
+    pub transactions_import_block_chunk_size: u64,
 
     /// The maximum number of roll forwards during a poll of the block streamer when importing transactions.
     pub cardano_transactions_block_streamer_max_roll_forwards_per_poll: u32,

mithril-signer/src/configuration.rs

@@ -577,7 +577,7 @@ mod tests {
         ));
         let metrics_service = Arc::new(MetricsService::new().unwrap());
         let signed_entity_type_lock = Arc::new(SignedEntityTypeLock::default());
-        let security_parameter = 0;
+        let security_parameter = BlockNumber(0);
         let cardano_transactions_preloader = Arc::new(CardanoTransactionsPreloader::new(
             signed_entity_type_lock.clone(),
             transactions_importer.clone(),

mithril-signer/src/runtime/runner.rs

@@ -47,7 +47,7 @@ impl TransactionsImporter for TransactionsImporterByChunk {
             .highest_transaction_block_number_getter
             .get()
             .await?
-            .unwrap_or(0);
+            .unwrap_or(BlockNumber(0));
 
         while intermediate_up_to < up_to_beacon {
             let next_up_to = (intermediate_up_to + self.chunk_size).min(up_to_beacon);
@@ -92,7 +92,9 @@ mod tests {
         })
     }
 
-    fn create_transaction_importer_mock(expected_values: Vec<u64>) -> MockTransactionImporterImpl {
+    fn create_transaction_importer_mock(
+        expected_values: Vec<BlockNumber>,
+    ) -> MockTransactionImporterImpl {
         let mut seq = Sequence::new();
         let mut wrapped_importer = MockTransactionImporterImpl::new();
         for expected_value in expected_values {
@@ -108,8 +110,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_import_nothing_to_do_when_highest_block_number_lower_or_equal_up_to_beacon() {
-        let highest_block_number = 10;
-        let chunk_size = 5;
+        let highest_block_number = BlockNumber(10);
+        let chunk_size = BlockNumber(5);
 
         let highest_transaction_block_number_getter =
             create_highest_transaction_block_number_getter_mock(highest_block_number);
@@ -133,7 +135,7 @@ mod tests {
     #[tokio::test]
     async fn test_import_even_when_highest_block_number_is_none() {
         let highest_block_number = None;
-        let chunk_size = 5;
+        let chunk_size = BlockNumber(5);
         let up_to_beacon = chunk_size - 1;
 
         let highest_transaction_block_number_getter = Arc::new({
@@ -156,8 +158,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_import_only_once_when_block_delta_less_than_chunk_size() {
-        let highest_block_number = 10;
-        let chunk_size = 5;
+        let highest_block_number = BlockNumber(10);
+        let chunk_size = BlockNumber(5);
         let up_to_beacon = highest_block_number + chunk_size - 1;
 
         let highest_transaction_block_number_getter =
@@ -176,8 +178,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_import_multiple_times_when_block_delta_is_not_a_multiple_of_chunk_size() {
-        let highest_block_number = 10;
-        let chunk_size = 5;
+        let highest_block_number = BlockNumber(10);
+        let chunk_size = BlockNumber(5);
         let up_to_beacon = highest_block_number + chunk_size * 2 + 1;
 
         let highest_transaction_block_number_getter =
@@ -200,8 +202,8 @@ mod tests {
 
     #[tokio::test]
     async fn test_import_multiple_times_when_block_delta_is_a_multiple_of_chunk_size() {
-        let highest_block_number = 10;
-        let chunk_size = 5;
+        let highest_block_number = BlockNumber(10);
+        let chunk_size = BlockNumber(5);
         let up_to_beacon = highest_block_number + chunk_size * 2;
 
         let highest_transaction_block_number_getter =

mithril-signer/src/transactions_importer_by_chunk.rs

@@ -52,7 +52,7 @@ impl TransactionsImporter for TransactionsImporterWithPruner {
             debug!(
                 self.logger,
                 "Transaction Import finished - Pruning transactions included in block range roots";
-                "number_of_blocks_to_keep" => number_of_blocks_to_keep,
+                "number_of_blocks_to_keep" => *number_of_blocks_to_keep,
             );
             self.transaction_pruner
                 .prune(number_of_blocks_to_keep)
@@ -117,12 +117,15 @@ mod tests {
             },
         );
 
-        importer.import(100).await.expect("Import should not fail");
+        importer
+            .import(BlockNumber(100))
+            .await
+            .expect("Import should not fail");
     }
 
     #[tokio::test]
     async fn test_does_prune_if_a_block_number_is_configured() {
-        let expected_block_number: BlockNumber = 5;
+        let expected_block_number = BlockNumber(5);
         let importer = TransactionsImporterWithPruner::new_with_mock(
             Some(expected_block_number),
             |mock| {
@@ -136,6 +139,9 @@ mod tests {
             },
         );
 
-        importer.import(100).await.expect("Import should not fail");
+        importer
+            .import(BlockNumber(100))
+            .await
+            .expect("Import should not fail");
     }
 }

mithril-signer/src/transactions_importer_with_pruner.rs

@@ -122,7 +122,10 @@ mod tests {
 
         let initial_size = db_path.metadata().unwrap().len();
 
-        importer.import(100).await.expect("Import should not fail");
+        importer
+            .import(BlockNumber(100))
+            .await
+            .expect("Import should not fail");
 
         let after_import_size = db_path.metadata().unwrap().len();
 

mithril-signer/src/transactions_importer_with_vacuum.rs

@@ -2,7 +2,7 @@ mod test_extensions;
 
 use mithril_common::{
     crypto_helper::tests_setup,
-    entities::{ChainPoint, Epoch, SignedEntityTypeDiscriminants, TimePoint},
+    entities::{BlockNumber, ChainPoint, Epoch, SignedEntityTypeDiscriminants, TimePoint},
     test_utils::MithrilFixtureBuilder,
 };
 
@@ -24,7 +24,7 @@ async fn test_create_cardano_transaction_single_signature() {
             slot_number: 100,
             // Note: the starting block number must be greater than the cardano_transactions_signing_config.step
             // so first block range root computation is not on block 0.
-            block_number: 100,
+            block_number: BlockNumber(100),
             block_hash: "block_hash-100".to_string(),
         },
     };

mithril-signer/tests/create_cardano_transaction_single_signature.rs

@@ -2,7 +2,7 @@ mod test_extensions;
 
 use mithril_common::{
     crypto_helper::tests_setup,
-    entities::{ChainPoint, Epoch, TimePoint},
+    entities::{BlockNumber, ChainPoint, Epoch, TimePoint},
     test_utils::MithrilFixtureBuilder,
 };
 
@@ -20,7 +20,7 @@ async fn test_create_immutable_files_full_single_signature() {
         immutable_file_number: 1,
         chain_point: ChainPoint {
             slot_number: 1,
-            block_number: 100,
+            block_number: BlockNumber(100),
             block_hash: "block_hash-100".to_string(),
         },
     };

mithril-signer/tests/create_immutable_files_full_single_signature.rs

@@ -2,11 +2,10 @@ mod test_extensions;
 
 use mithril_common::{
     crypto_helper::tests_setup,
-    entities::{ChainPoint, Epoch, TimePoint},
+    entities::{BlockNumber, ChainPoint, Epoch, TimePoint},
     era::{EraMarker, SupportedEra},
     test_utils::MithrilFixtureBuilder,
 };
-
 use test_extensions::StateMachineTester;
 
 #[rustfmt::skip]
@@ -20,7 +19,7 @@ async fn era_fail_at_startup() {
         immutable_file_number: 1,
         chain_point: ChainPoint {
             slot_number: 1,
-            block_number: 100,
+            block_number: BlockNumber(100),
             block_hash: "block_hash-100".to_string(),
         },
     };

mithril-signer/tests/era_switch.rs

@@ -15,7 +15,7 @@ use mithril_common::{
     chain_observer::{ChainObserver, FakeObserver},
     digesters::{DumbImmutableDigester, DumbImmutableFileObserver, ImmutableFileObserver},
     entities::{
-        CardanoTransactionsSigningConfig, ChainPoint, Epoch, SignedEntityConfig,
+        BlockNumber, CardanoTransactionsSigningConfig, ChainPoint, Epoch, SignedEntityConfig,
         SignedEntityTypeDiscriminants, SignerWithStake, SlotNumber, TimePoint,
     },
     era::{adapters::EraReaderDummyAdapter, EraChecker, EraMarker, EraReader, SupportedEra},
@@ -129,8 +129,8 @@ impl StateMachineTester {
             immutable_observer.clone(),
         ));
         let cardano_transactions_signing_config = CardanoTransactionsSigningConfig {
-            security_parameter: 0,
-            step: 30,
+            security_parameter: BlockNumber(0),
+            step: BlockNumber(30),
         };
         let certificate_handler = Arc::new(FakeAggregator::new(
             SignedEntityConfig {
@@ -203,7 +203,7 @@ impl StateMachineTester {
         let metrics_service = Arc::new(MetricsService::new().unwrap());
         let expected_metrics_service = Arc::new(MetricsService::new().unwrap());
         let signed_entity_type_lock = Arc::new(SignedEntityTypeLock::default());
-        let security_parameter = 0;
+        let security_parameter = BlockNumber(0);
         let cardano_transactions_preloader = Arc::new(CardanoTransactionsPreloader::new(
             signed_entity_type_lock.clone(),
             transactions_importer.clone(),
@@ -451,7 +451,7 @@ impl StateMachineTester {
                 let slot_number = block_number;
                 ScannedBlock::new(
                     block_hash,
-                    block_number,
+                    BlockNumber(block_number),
                     slot_number,
                     vec![format!("tx_hash-{block_number}-1")],
                 )
@@ -488,7 +488,7 @@ impl StateMachineTester {
 
         let chain_point = ChainPoint {
             slot_number: rollback_to_slot_number,
-            block_number: rollback_to_slot_number,
+            block_number: BlockNumber(rollback_to_slot_number),
             block_hash: format!("block_hash-{rollback_to_slot_number}"),
         };
         self.block_scanner.add_backward(chain_point);