Remove immutable_file_number from CardanoTransaction

sfauvel · sfauvel · commit 70595345f70d · 2024-07-17T16:53:39.000+02:00
diff --git a/internal/mithril-persistence/src/database/record/cardano_transaction.rs b/internal/mithril-persistence/src/database/record/cardano_transaction.rs
@@ -52,7 +52,7 @@ impl From<CardanoTransaction> for CardanoTransactionRecord {
             block_number: transaction.block_number,
             slot_number: transaction.slot_number,
             block_hash: transaction.block_hash,
-            immutable_file_number: transaction.immutable_file_number,
+            immutable_file_number: 0,
         }
     }
 }
@@ -64,7 +64,6 @@ impl From<CardanoTransactionRecord> for CardanoTransaction {
             block_number: other.block_number,
             slot_number: other.slot_number,
             block_hash: other.block_hash,
-            immutable_file_number: other.immutable_file_number,
         }
     }
 }
diff --git a/internal/mithril-persistence/src/database/repository/cardano_transaction_repository.rs b/internal/mithril-persistence/src/database/repository/cardano_transaction_repository.rs
@@ -340,8 +340,8 @@ mod tests {
 
         repository
             .create_transactions(vec![
-                CardanoTransaction::new("tx_hash-123", 10, 50, "block_hash-123", 99),
-                CardanoTransaction::new("tx_hash-456", 11, 51, "block_hash-456", 100),
+                CardanoTransaction::new("tx_hash-123", 10, 50, "block_hash-123"),
+                CardanoTransaction::new("tx_hash-456", 11, 51, "block_hash-456"),
             ])
             .await
             .unwrap();
@@ -354,7 +354,7 @@ mod tests {
                     block_number: 10,
                     slot_number: 50,
                     block_hash: "block_hash-123".to_string(),
-                    immutable_file_number: 99
+                    immutable_file_number: 0
                 }),
                 transaction_result
             );
@@ -471,8 +471,8 @@ mod tests {
         ));
 
         let cardano_transactions = vec![
-            CardanoTransaction::new("tx-hash-123", 10, 50, "block-hash-123", 99),
-            CardanoTransaction::new("tx-hash-456", 11, 51, "block-hash-456", 100),
+            CardanoTransaction::new("tx-hash-123", 10, 50, "block-hash-123"),
+            CardanoTransaction::new("tx-hash-456", 11, 51, "block-hash-456"),
         ];
         repository
             .create_transactions(cardano_transactions)
@@ -487,7 +487,7 @@ mod tests {
                 block_number: 10,
                 slot_number: 50,
                 block_hash: "block-hash-123".to_string(),
-                immutable_file_number: 99
+                immutable_file_number: 0
             }),
             transaction_result
         );
@@ -500,7 +500,7 @@ mod tests {
                 block_number: 11,
                 slot_number: 51,
                 block_hash: "block-hash-456".to_string(),
-                immutable_file_number: 100,
+                immutable_file_number: 0,
             }),
             transaction_result
         );
@@ -514,8 +514,8 @@ mod tests {
         ));
 
         let cardano_transactions = vec![
-            CardanoTransaction::new("tx-hash-123".to_string(), 10, 50, "block-hash-123", 99),
-            CardanoTransaction::new("tx-hash-456".to_string(), 11, 51, "block-hash-456", 100),
+            CardanoTransaction::new("tx-hash-123".to_string(), 10, 50, "block-hash-123"),
+            CardanoTransaction::new("tx-hash-456".to_string(), 11, 51, "block-hash-456"),
         ];
         repository
             .create_transactions(cardano_transactions.clone())
@@ -548,7 +548,6 @@ mod tests {
             10,
             50,
             "block-hash-123",
-            99,
         )];
         repository
             .create_transactions(cardano_transactions)
@@ -591,8 +590,8 @@ mod tests {
         ));
 
         let cardano_transactions = vec![
-            CardanoTransaction::new("tx-hash-123", 10, 50, "block-hash-10", 50),
-            CardanoTransaction::new("tx-hash-456", 25, 51, "block-hash-25", 100),
+            CardanoTransaction::new("tx-hash-123", 10, 50, "block-hash-10"),
+            CardanoTransaction::new("tx-hash-456", 25, 51, "block-hash-25"),
         ];
         repository
             .create_transactions(cardano_transactions)
@@ -622,9 +621,9 @@ mod tests {
         ));
 
         let cardano_transactions = vec![
-            CardanoTransaction::new("tx-hash-123", 10, 50, "block-hash-10", 50),
-            CardanoTransaction::new("tx-hash-456", 25, 51, "block-hash-25", 100),
-            CardanoTransaction::new("tx-hash-789", 25, 51, "block-hash-25", 100),
+            CardanoTransaction::new("tx-hash-123", 10, 50, "block-hash-10"),
+            CardanoTransaction::new("tx-hash-456", 25, 51, "block-hash-25"),
+            CardanoTransaction::new("tx-hash-789", 25, 51, "block-hash-25"),
         ];
         repository
             .create_transactions(cardano_transactions)
@@ -667,8 +666,8 @@ mod tests {
         ));
 
         let cardano_transactions = vec![
-            CardanoTransaction::new("tx-hash-123".to_string(), 10, 50, "block-hash-123", 50),
-            CardanoTransaction::new("tx-hash-456".to_string(), 11, 51, "block-hash-456", 100),
+            CardanoTransactionRecord::new("tx-hash-123".to_string(), 10, 50, "block-hash-123", 50),
+            CardanoTransactionRecord::new("tx-hash-456".to_string(), 11, 51, "block-hash-456", 100),
         ];
         repository
             .create_transactions(cardano_transactions)
@@ -1056,21 +1055,14 @@ mod tests {
         ));
 
         let cardano_transactions = vec![
-            CardanoTransaction::new("tx-hash-123", BlockRange::LENGTH, 50, "block-hash-123", 50),
+            CardanoTransaction::new("tx-hash-123", BlockRange::LENGTH, 50, "block-hash-123"),
             CardanoTransaction::new(
                 "tx-hash-123",
                 BlockRange::LENGTH * 3 - 1,
                 50,
                 "block-hash-123",
-                50,
-            ),
-            CardanoTransaction::new(
-                "tx-hash-456",
-                BlockRange::LENGTH * 3,
-                51,
-                "block-hash-456",
-                100,
             ),
+            CardanoTransaction::new("tx-hash-456", BlockRange::LENGTH * 3, 51, "block-hash-456"),
         ];
         repository
             .create_transactions(cardano_transactions)
diff --git a/mithril-aggregator/benches/cardano_transactions_get.rs b/mithril-aggregator/benches/cardano_transactions_get.rs
@@ -35,7 +35,6 @@ fn generate_transactions(nb_transactions: usize) -> Vec<CardanoTransaction> {
                 i as u64,
                 i as u64 * 100,
                 format!("block_hash-{}", i),
-                i as u64 + 1,
             )
         })
         .collect()
diff --git a/mithril-aggregator/benches/cardano_transactions_import.rs b/mithril-aggregator/benches/cardano_transactions_import.rs
@@ -30,7 +30,6 @@ fn generate_transactions(nb_transactions: usize) -> Vec<CardanoTransaction> {
                 i as u64,
                 i as u64 + 1,
                 format!("block_hash-{}", i),
-                i as u64 + 2,
             )
         })
         .collect()
diff --git a/mithril-aggregator/src/services/cardano_transactions_importer.rs b/mithril-aggregator/src/services/cardano_transactions_importer.rs
@@ -422,7 +422,7 @@ mod tests {
             ScannedBlock::new("block_hash-2", 20, 25, 11, vec!["tx_hash-3", "tx_hash-4"]),
         ]]);
 
-        let last_tx = CardanoTransaction::new("tx-20", 30, 35, "block_hash-3", up_to_block_number);
+        let last_tx = CardanoTransaction::new("tx-20", 30, 35, "block_hash-3");
         repository
             .store_transactions(vec![last_tx.clone()])
             .await
diff --git a/mithril-common/src/cardano_block_scanner/scanned_block.rs b/mithril-common/src/cardano_block_scanner/scanned_block.rs
@@ -72,7 +72,6 @@ impl ScannedBlock {
                     self.block_number,
                     self.slot_number,
                     self.block_hash.clone(),
-                    self.immutable_file_number,
                 )
             })
             .collect::<Vec<_>>()
diff --git a/mithril-common/src/entities/cardano_transaction.rs b/mithril-common/src/entities/cardano_transaction.rs
@@ -1,6 +1,6 @@
 use crate::{
     crypto_helper::MKTreeNode,
-    entities::{BlockHash, BlockNumber, ImmutableFileNumber, SlotNumber},
+    entities::{BlockHash, BlockNumber, SlotNumber},
 };
 
 /// TransactionHash is the unique identifier of a cardano transaction.
@@ -20,9 +20,6 @@ pub struct CardanoTransaction {
 
     /// Block hash of the transaction
     pub block_hash: BlockHash,
-
-    /// Immutable file number of the transaction
-    pub immutable_file_number: ImmutableFileNumber,
 }
 
 impl CardanoTransaction {
@@ -32,14 +29,12 @@ impl CardanoTransaction {
         block_number: BlockNumber,
         slot_number: SlotNumber,
         block_hash: U,
-        immutable_file_number: ImmutableFileNumber,
     ) -> Self {
         Self {
             transaction_hash: hash.into(),
             block_number,
             slot_number,
             block_hash: block_hash.into(),
-            immutable_file_number,
         }
     }
 }
@@ -62,7 +57,7 @@ mod tests {
 
     #[test]
     fn test_convert_cardano_transaction_to_merkle_tree_node() {
-        let transaction = CardanoTransaction::new("tx-hash-123", 10, 4, "block_hash", 1);
+        let transaction = CardanoTransaction::new("tx-hash-123", 10, 4, "block_hash");
 
         let computed_mktree_node: MKTreeNode = transaction.into();
         let expected_mk_tree_node = MKTreeNode::new("tx-hash-123".as_bytes().to_vec());
diff --git a/mithril-common/src/messages/cardano_transactions_proof.rs b/mithril-common/src/messages/cardano_transactions_proof.rs
@@ -330,8 +330,8 @@ mod tests {
         async fn verify_hashes_from_verified_cardano_transaction_and_from_signable_builder_are_equals(
         ) {
             let transactions = vec![
-                CardanoTransaction::new("tx-hash-123", 10, 1, "block_hash", 1),
-                CardanoTransaction::new("tx-hash-456", 20, 2, "block_hash", 1),
+                CardanoTransaction::new("tx-hash-123", 10, 1, "block_hash"),
+                CardanoTransaction::new("tx-hash-456", 20, 2, "block_hash"),
             ];
 
             assert_eq!(
diff --git a/mithril-common/src/test_utils/cardano_transactions_builder.rs b/mithril-common/src/test_utils/cardano_transactions_builder.rs
@@ -18,14 +18,14 @@ use crate::entities::{BlockRange, CardanoTransaction};
 ///     assert_eq!(8, txs.len());
 ///     assert_eq!(
 ///         vec![
-///             CardanoTransaction::new("tx-hash-0-100", 0, 100, "block-hash-0", 0),
-///             CardanoTransaction::new("tx-hash-0-101", 0, 101, "block-hash-0", 0),
-///             CardanoTransaction::new("tx-hash-0-102", 0, 102, "block-hash-0", 0),
-///             CardanoTransaction::new("tx-hash-1-103", 1, 103, "block-hash-1", 0),
-///             CardanoTransaction::new("tx-hash-1-104", 1, 104, "block-hash-1", 0),
-///             CardanoTransaction::new("tx-hash-1-105", 1, 105, "block-hash-1", 0),
-///             CardanoTransaction::new("tx-hash-15-106", 15, 106, "block-hash-15", 0),
-///             CardanoTransaction::new("tx-hash-15-107", 15, 107, "block-hash-15", 0)
+///             CardanoTransaction::new("tx-hash-0-100", 0, 100, "block-hash-0"),
+///             CardanoTransaction::new("tx-hash-0-101", 0, 101, "block-hash-0"),
+///             CardanoTransaction::new("tx-hash-0-102", 0, 102, "block-hash-0"),
+///             CardanoTransaction::new("tx-hash-1-103", 1, 103, "block-hash-1"),
+///             CardanoTransaction::new("tx-hash-1-104", 1, 104, "block-hash-1"),
+///             CardanoTransaction::new("tx-hash-1-105", 1, 105, "block-hash-1"),
+///             CardanoTransaction::new("tx-hash-15-106", 15, 106, "block-hash-15"),
+///             CardanoTransaction::new("tx-hash-15-107", 15, 107, "block-hash-15")
 ///         ],
 ///         txs
 ///     );
@@ -45,18 +45,18 @@ use crate::entities::{BlockRange, CardanoTransaction};
 ///     assert_eq!(3 * 2 * 2, txs.len());
 ///     assert_eq!(
 ///         vec![
-///             CardanoTransaction::new("tx-hash-0-100", 0, 100, "block-hash-0", 0),
-///             CardanoTransaction::new("tx-hash-0-101", 0, 101, "block-hash-0", 0),
-///             CardanoTransaction::new("tx-hash-0-102", 0, 102, "block-hash-0", 0),
-///             CardanoTransaction::new("tx-hash-1-103", 1, 103, "block-hash-1", 0),
-///             CardanoTransaction::new("tx-hash-1-104", 1, 104, "block-hash-1", 0),
-///             CardanoTransaction::new("tx-hash-1-105", 1, 105, "block-hash-1", 0),
-///             CardanoTransaction::new("tx-hash-15-106", 15, 106, "block-hash-15", 0),
-///             CardanoTransaction::new("tx-hash-15-107", 15, 107, "block-hash-15", 0),
-///             CardanoTransaction::new("tx-hash-15-108", 15, 108, "block-hash-15", 0),
-///             CardanoTransaction::new("tx-hash-16-109", 16, 109, "block-hash-16", 0),
-///             CardanoTransaction::new("tx-hash-16-110", 16, 110, "block-hash-16", 0),
-///             CardanoTransaction::new("tx-hash-16-111", 16, 111, "block-hash-16", 0),
+///             CardanoTransaction::new("tx-hash-0-100", 0, 100, "block-hash-0"),
+///             CardanoTransaction::new("tx-hash-0-101", 0, 101, "block-hash-0"),
+///             CardanoTransaction::new("tx-hash-0-102", 0, 102, "block-hash-0"),
+///             CardanoTransaction::new("tx-hash-1-103", 1, 103, "block-hash-1"),
+///             CardanoTransaction::new("tx-hash-1-104", 1, 104, "block-hash-1"),
+///             CardanoTransaction::new("tx-hash-1-105", 1, 105, "block-hash-1"),
+///             CardanoTransaction::new("tx-hash-15-106", 15, 106, "block-hash-15"),
+///             CardanoTransaction::new("tx-hash-15-107", 15, 107, "block-hash-15"),
+///             CardanoTransaction::new("tx-hash-15-108", 15, 108, "block-hash-15"),
+///             CardanoTransaction::new("tx-hash-16-109", 16, 109, "block-hash-16"),
+///             CardanoTransaction::new("tx-hash-16-110", 16, 110, "block-hash-16"),
+///             CardanoTransaction::new("tx-hash-16-111", 16, 111, "block-hash-16"),
 ///         ],
 ///         txs
 ///     );
@@ -141,7 +141,6 @@ impl CardanoTransactionsBuilder {
             block_number,
             transaction_id,
             format!("block-hash-{block_number}"),
-            0,
         )
     }
 }
@@ -173,10 +172,6 @@ mod test {
         grouped_by_block
     }
 
-    fn extract_by<T, R>(list: &[T], extract_value: &dyn Fn(&T) -> R) -> Vec<R> {
-        list.iter().map(extract_value).collect()
-    }
-
     #[test]
     fn return_given_number_of_transactions_with_distinct_values() {
         let txs = CardanoTransactionsBuilder::new().build_transactions(3);
diff --git a/mithril-signer/src/cardano_transactions_importer.rs b/mithril-signer/src/cardano_transactions_importer.rs
@@ -422,7 +422,7 @@ mod tests {
             ScannedBlock::new("block_hash-2", 20, 25, 11, vec!["tx_hash-3", "tx_hash-4"]),
         ]]);
 
-        let last_tx = CardanoTransaction::new("tx-20", 30, 35, "block_hash-3", up_to_block_number);
+        let last_tx = CardanoTransaction::new("tx-20", 30, 35, "block_hash-3");
         repository
             .store_transactions(vec![last_tx.clone()])
             .await

Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ impl From<CardanoTransaction> for CardanoTransactionRecord {`
`52`	`52`	`block_number: transaction.block_number,`
`53`	`53`	`slot_number: transaction.slot_number,`
`54`	`54`	`block_hash: transaction.block_hash,`
`55`		`- immutable_file_number: transaction.immutable_file_number,`
	`55`	`+ immutable_file_number: 0,`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`	`}`
`@@ -64,7 +64,6 @@ impl From<CardanoTransactionRecord> for CardanoTransaction {`
`64`	`64`	`block_number: other.block_number,`
`65`	`65`	`slot_number: other.slot_number,`
`66`	`66`	`block_hash: other.block_hash,`
`67`		`- immutable_file_number: other.immutable_file_number,`
`68`	`67`	`}`
`69`	`68`	`}`
`70`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@ fn generate_transactions(nb_transactions: usize) -> Vec<CardanoTransaction> {`
`35`	`35`	`i as u64,`
`36`	`36`	`i as u64 * 100,`
`37`	`37`	`format!("block_hash-{}", i),`
`38`		`- i as u64 + 1,`
`39`	`38`	`)`
`40`	`39`	`})`
`41`	`40`	`.collect()`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,6 @@ fn generate_transactions(nb_transactions: usize) -> Vec<CardanoTransaction> {`
`30`	`30`	`i as u64,`
`31`	`31`	`i as u64 + 1,`
`32`	`32`	`format!("block_hash-{}", i),`
`33`		`- i as u64 + 2,`
`34`	`33`	`)`
`35`	`34`	`})`
`36`	`35`	`.collect()`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,6 @@ impl ScannedBlock {`
`72`	`72`	`self.block_number,`
`73`	`73`	`self.slot_number,`
`74`	`74`	`self.block_hash.clone(),`
`75`		`- self.immutable_file_number,`
`76`	`75`	`)`
`77`	`76`	`})`
`78`	`77`	`.collect::<Vec<_>>()`