PR review: avoid using RangeInclusive

To be consistent with all usages or ranges for blocks, this remove the
last usage of a range inclusive to only use non-inclusive range.
The last case of RangeInclusive was a test that checked that an inverval
is contained in a block ranges sequence.

To do so it add a `contains(range)` to `BlockRangesSequence`.

Author: Alenar

mithril-aggregator/src/services/cardano_transactions_importer.rs

@@ -182,7 +182,7 @@ mod tests {
 
     use mithril_common::cardano_block_scanner::{DumbBlockScanner, ScannedBlock};
     use mithril_common::crypto_helper::MKTree;
-    use mithril_common::entities::BlockNumber;
+    use mithril_common::entities::{BlockNumber, BlockRangesSequence};
 
     use crate::database::repository::CardanoTransactionRepository;
     use crate::database::test_helper::cardano_tx_db_connection;
@@ -534,8 +534,8 @@ mod tests {
                 // Upper bound should be the block number of the highest transaction in a db that can be
                 // included in a block range
                 .withf(|range| {
-                    let expected_range = BlockRange::LENGTH..=(BlockRange::LENGTH * 5);
-                    expected_range.contains(&range.start) && expected_range.contains(&range.end)
+                    BlockRangesSequence::new(BlockRange::LENGTH..(BlockRange::LENGTH * 5))
+                        .contains(range)
                 })
                 .returning(transactions_for_block);
             store_mock

mithril-common/src/entities/block_range.rs

@@ -179,6 +179,11 @@ impl BlockRangesSequence {
         self.end
     }
 
+    /// Returns `true` if range is contained in the sequence.
+    pub fn contains(&self, range: &Range<BlockNumber>) -> bool {
+        self.start <= range.start && range.end <= self.end
+    }
+
     /// Returns `true` if the block ranges sequence contains no elements.
     pub fn is_empty(&self) -> bool {
         self.len() == 0
@@ -338,6 +343,20 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_block_ranges_sequence_contains() {
+        let block_range = BlockRange::new(15, 30);
+        assert!(BlockRange::all_block_ranges_in(0..15)
+            .contains(&block_range)
+            .not());
+        assert!(BlockRange::all_block_ranges_in(30..60)
+            .contains(&block_range)
+            .not());
+        assert!(BlockRange::all_block_ranges_in(0..30).contains(&block_range));
+        assert!(BlockRange::all_block_ranges_in(15..30).contains(&block_range));
+        assert!(BlockRange::all_block_ranges_in(15..45).contains(&block_range));
+    }
+
     #[test]
     fn test_block_range_from_number() {
         assert_eq!(BlockRange::from_block_number(0), BlockRange::new(0, 15));

mithril-signer/src/cardano_transactions_importer.rs

@@ -182,7 +182,7 @@ mod tests {
 
     use mithril_common::cardano_block_scanner::{DumbBlockScanner, ScannedBlock};
     use mithril_common::crypto_helper::MKTree;
-    use mithril_common::entities::BlockNumber;
+    use mithril_common::entities::{BlockNumber, BlockRangesSequence};
 
     use crate::database::repository::CardanoTransactionRepository;
     use crate::database::test_utils::cardano_tx_db_connection;
@@ -534,8 +534,8 @@ mod tests {
                 // Upper bound should be the block number of the highest transaction in a db that can be
                 // included in a block range
                 .withf(|range| {
-                    let expected_range = BlockRange::LENGTH..=(BlockRange::LENGTH * 5);
-                    expected_range.contains(&range.start) && expected_range.contains(&range.end)
+                    BlockRangesSequence::new(BlockRange::LENGTH..(BlockRange::LENGTH * 5))
+                        .contains(range)
                 })
                 .returning(transactions_for_block);
             store_mock