Use new BlockNumber type in mithril-aggregator

Author: Alenar

mithril-aggregator/benches/cardano_transactions_get.rs

@@ -4,7 +4,8 @@ use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
 use sqlite::ConnectionThreadSafe;
 
 use mithril_aggregator::services::TransactionStore;
-use mithril_common::{entities::CardanoTransaction, test_utils::TempDir};
+use mithril_common::entities::{BlockNumber, CardanoTransaction};
+use mithril_common::test_utils::TempDir;
 use mithril_persistence::database::repository::CardanoTransactionRepository;
 use mithril_persistence::sqlite::{ConnectionBuilder, SqliteConnectionPool};
 
@@ -32,7 +33,7 @@ fn generate_transactions(nb_transactions: usize) -> Vec<CardanoTransaction> {
         .map(|i| {
             CardanoTransaction::new(
                 format!("tx_hash-{}", i),
-                i as u64,
+                BlockNumber(i as u64),
                 i as u64 * 100,
                 format!("block_hash-{}", i),
             )
@@ -68,7 +69,7 @@ fn run_bench(c: &mut Criterion, nb_transaction_in_db: usize) {
             |b, &max_block_number| {
                 b.to_async(&runtime).iter(|| async {
                     let _transactions = repository
-                        .get_transactions_in_range(0..max_block_number)
+                        .get_transactions_in_range(BlockNumber(0)..BlockNumber(max_block_number))
                         .await
                         .unwrap();
                 });

mithril-aggregator/benches/cardano_transactions_import.rs

@@ -2,7 +2,8 @@ use criterion::{criterion_group, criterion_main, Criterion};
 use sqlite::ConnectionThreadSafe;
 use std::sync::Arc;
 
-use mithril_common::{entities::CardanoTransaction, test_utils::TempDir};
+use mithril_common::entities::{BlockNumber, CardanoTransaction};
+use mithril_common::test_utils::TempDir;
 use mithril_persistence::database::repository::CardanoTransactionRepository;
 use mithril_persistence::sqlite::{ConnectionBuilder, SqliteConnectionPool};
 
@@ -27,7 +28,7 @@ fn generate_transactions(nb_transactions: usize) -> Vec<CardanoTransaction> {
         .map(|i| {
             CardanoTransaction::new(
                 format!("tx_hash-{}", i),
-                i as u64,
+                BlockNumber(i as u64),
                 i as u64 + 1,
                 format!("block_hash-{}", i),
             )

mithril-aggregator/src/artifact_builder/cardano_transactions.rs

@@ -82,7 +82,7 @@ mod tests {
                 ..fake_data::certificate("certificate-123".to_string())
             }
         };
-        let beacon = 100;
+        let beacon = BlockNumber(100);
 
         let artifact = cardano_transaction_artifact_builder
             .compute_artifact(beacon, &certificate_with_merkle_root)
@@ -106,7 +106,7 @@ mod tests {
             protocol_message: ProtocolMessage::new(),
             ..fake_data::certificate("certificate-123".to_string())
         };
-        let beacon = 100;
+        let beacon = BlockNumber(100);
 
         cardano_transaction_artifact_builder
             .compute_artifact(beacon, &certificate_without_merkle_root)

mithril-aggregator/src/configuration.rs

@@ -10,8 +10,9 @@ use std::path::PathBuf;
 use std::str::FromStr;
 
 use mithril_common::entities::{
-    CardanoTransactionsSigningConfig, CompressionAlgorithm, HexEncodedGenesisVerificationKey,
-    ProtocolParameters, SignedEntityConfig, SignedEntityTypeDiscriminants,
+    BlockNumber, CardanoTransactionsSigningConfig, CompressionAlgorithm,
+    HexEncodedGenesisVerificationKey, ProtocolParameters, SignedEntityConfig,
+    SignedEntityTypeDiscriminants,
 };
 use mithril_common::{CardanoNetwork, StdResult};
 
@@ -248,8 +249,8 @@ impl Configuration {
             cardano_transactions_prover_cache_pool_size: 3,
             cardano_transactions_database_connection_pool_size: 5,
             cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
-                security_parameter: 100,
-                step: 15,
+                security_parameter: BlockNumber(100),
+                step: BlockNumber(15),
             },
             cardano_transactions_prover_max_hashes_allowed_by_request: 100,
             cardano_transactions_block_streamer_max_roll_forwards_per_poll: 1000,
@@ -395,8 +396,8 @@ impl Default for DefaultConfiguration {
             cardano_transactions_prover_cache_pool_size: 10,
             cardano_transactions_database_connection_pool_size: 10,
             cardano_transactions_signing_config: CardanoTransactionsSigningConfig {
-                security_parameter: 3000,
-                step: 120,
+                security_parameter: BlockNumber(3000),
+                step: BlockNumber(120),
             },
             cardano_transactions_prover_max_hashes_allowed_by_request: 100,
             cardano_transactions_block_streamer_max_roll_forwards_per_poll: 10000,
@@ -473,14 +474,14 @@ impl Source for DefaultConfiguration {
                 (
                     "security_parameter".to_string(),
                     ValueKind::from(
-                        myself
+                        *myself
                             .cardano_transactions_signing_config
                             .security_parameter,
                     ),
                 ),
                 (
                     "step".to_string(),
-                    ValueKind::from(myself.cardano_transactions_signing_config.step),
+                    ValueKind::from(*myself.cardano_transactions_signing_config.step),
                 ),
             ])),
         );

mithril-aggregator/src/database/repository/open_message_repository.rs

@@ -104,7 +104,7 @@ impl OpenMessageRepository {
 
 #[cfg(test)]
 mod tests {
-    use mithril_common::entities::CardanoDbBeacon;
+    use mithril_common::entities::{BlockNumber, CardanoDbBeacon};
 
     use crate::database::record::SingleSignatureRecord;
     use crate::database::test_helper::{
@@ -184,7 +184,7 @@ mod tests {
         for signed_entity_type in [
             SignedEntityType::MithrilStakeDistribution(epoch),
             SignedEntityType::CardanoImmutableFilesFull(CardanoDbBeacon::new("devnet", *epoch, 1)),
-            SignedEntityType::CardanoTransactions(epoch, 100),
+            SignedEntityType::CardanoTransactions(epoch, BlockNumber(100)),
         ] {
             repository
                 .create_open_message(epoch, &signed_entity_type, &ProtocolMessage::new())

mithril-aggregator/src/http_server/routes/artifact_routes/cardano_transaction.rs

@@ -96,7 +96,7 @@ pub mod tests {
         services::MockMessageService,
     };
     use mithril_common::{
-        entities::{Epoch, SignedEntityType},
+        entities::{BlockNumber, Epoch, SignedEntityType},
         messages::ToMessageAdapter,
         test_utils::{apispec::APISpec, fake_data},
     };
@@ -125,7 +125,7 @@ pub mod tests {
     #[tokio::test]
     async fn test_cardano_transactions_get_ok() {
         let signed_entity_records = create_signed_entities(
-            SignedEntityType::CardanoTransactions(Epoch(1), 120),
+            SignedEntityType::CardanoTransactions(Epoch(1), BlockNumber(120)),
             fake_data::cardano_transactions_snapshot(5),
         );
         let message = ToCardanoTransactionListMessageAdapter::adapt(signed_entity_records);
@@ -192,7 +192,7 @@ pub mod tests {
     #[tokio::test]
     async fn test_cardano_transaction_get_ok() {
         let signed_entity = create_signed_entities(
-            SignedEntityType::CardanoTransactions(Epoch(1), 100),
+            SignedEntityType::CardanoTransactions(Epoch(1), BlockNumber(100)),
             fake_data::cardano_transactions_snapshot(1),
         )
         .first()

mithril-aggregator/src/http_server/routes/proof_routes.rs

@@ -141,7 +141,9 @@ mod tests {
     };
 
     use mithril_common::{
-        entities::{CardanoTransactionsSetProof, CardanoTransactionsSnapshot, SignedEntity},
+        entities::{
+            BlockNumber, CardanoTransactionsSetProof, CardanoTransactionsSnapshot, SignedEntity,
+        },
         test_utils::{apispec::APISpec, assert_equivalent, fake_data},
     };
 
@@ -174,7 +176,8 @@ mod tests {
             .expect_compute_transactions_proofs()
             .returning(|_, _| Ok(vec![CardanoTransactionsSetProof::dummy()]));
 
-        let cardano_transactions_snapshot = CardanoTransactionsSnapshot::new(String::new(), 2309);
+        let cardano_transactions_snapshot =
+            CardanoTransactionsSnapshot::new(String::new(), BlockNumber(2309));
 
         let signed_entity = SignedEntity::<CardanoTransactionsSnapshot> {
             artifact: cardano_transactions_snapshot,