PR review: style & naming adjusments

Author: Alenar

mithril-common/src/cardano_block_scanner/immutable_block_streamer.rs

@@ -13,15 +13,15 @@ use crate::StdResult;
 
 /// [Block streamer][BlockStreamer] that streams blocks immutable files per immutable files
 pub struct ImmutableBlockStreamer {
-    remaining_immutables: VecDeque<ImmutableFile>,
+    remaining_immutable_files: VecDeque<ImmutableFile>,
     allow_unparsable_block: bool,
     logger: Logger,
 }
 
 #[async_trait]
 impl BlockStreamer for ImmutableBlockStreamer {
     async fn poll_next(&mut self) -> StdResult<Option<Vec<ScannedBlock>>> {
-        match &self.remaining_immutables.pop_front() {
+        match &self.remaining_immutable_files.pop_front() {
             Some(immutable_file) => {
                 debug!(
                     self.logger,
@@ -52,7 +52,7 @@ impl ImmutableBlockStreamer {
         logger: Logger,
     ) -> Self {
         Self {
-            remaining_immutables: VecDeque::from(immutables_chunk_to_stream),
+            remaining_immutable_files: VecDeque::from(immutables_chunk_to_stream),
             allow_unparsable_block,
             logger,
         }
@@ -148,19 +148,19 @@ mod tests {
 
         let immutable_blocks = streamer.poll_next().await.unwrap();
         assert_eq!(
-            immutable_blocks.map(|b| b.into_iter().map(|b| b.transaction_len()).sum()),
+            immutable_blocks.map(|b| b.into_iter().map(|b| b.transactions_len()).sum()),
             Some(immutable_files[0].1)
         );
 
         let immutable_blocks = streamer.poll_next().await.unwrap();
         assert_eq!(
-            immutable_blocks.map(|b| b.into_iter().map(|b| b.transaction_len()).sum()),
+            immutable_blocks.map(|b| b.into_iter().map(|b| b.transactions_len()).sum()),
             Some(immutable_files[1].1)
         );
 
         let immutable_blocks = streamer.poll_next().await.unwrap();
         assert_eq!(
-            immutable_blocks.map(|b| b.into_iter().map(|b| b.transaction_len()).sum()),
+            immutable_blocks.map(|b| b.into_iter().map(|b| b.transactions_len()).sum()),
             Some(immutable_files[2].1)
         );
 

mithril-common/src/cardano_block_scanner/scanned_block.rs

@@ -13,10 +13,10 @@ pub struct ScannedBlock {
     pub block_number: BlockNumber,
     /// Slot number of the block
     pub slot_number: SlotNumber,
-    /// Number of the immutable that own the block
+    /// Number of the immutable file that own the block
     pub immutable_file_number: ImmutableFileNumber,
     /// Hashes of the transactions in the block
-    pub transactions: Vec<TransactionHash>,
+    pub transactions_hashes: Vec<TransactionHash>,
 }
 
 impl ScannedBlock {
@@ -33,7 +33,7 @@ impl ScannedBlock {
             block_number,
             slot_number,
             immutable_file_number,
-            transactions: transaction_hashes.into_iter().map(|h| h.into()).collect(),
+            transactions_hashes: transaction_hashes.into_iter().map(|h| h.into()).collect(),
         }
     }
 
@@ -56,15 +56,15 @@ impl ScannedBlock {
     }
 
     /// Number of transactions in the block
-    pub fn transaction_len(&self) -> usize {
-        self.transactions.len()
+    pub fn transactions_len(&self) -> usize {
+        self.transactions_hashes.len()
     }
 
     /// Convert the scanned block into a list of Cardano transactions.
     ///
     /// Consume the block.
     pub fn into_transactions(self) -> Vec<CardanoTransaction> {
-        self.transactions
+        self.transactions_hashes
             .into_iter()
             .map(|transaction_hash| {
                 CardanoTransaction::new(