refactor: make computation of block range bounds more readable

Author: jpraynaud

mithril-aggregator/src/services/prover.rs

@@ -51,9 +51,10 @@ impl ProverService for MithrilProverService {
         let mut transactions_by_block_ranges: HashMap<BlockRange, Vec<TransactionHash>> =
             HashMap::new();
         for transaction in &transactions {
-            let block_range_start =
-                transaction.block_number / BLOCK_RANGE_LENGTH * BLOCK_RANGE_LENGTH;
-            let block_range_end = block_range_start + BLOCK_RANGE_LENGTH;
+            let block_range_end = transaction
+                .block_number
+                .next_multiple_of(BLOCK_RANGE_LENGTH);
+            let block_range_start = block_range_end - BLOCK_RANGE_LENGTH;
             let block_range = BlockRange::new(block_range_start, block_range_end);
             if transaction_hashes.contains(&transaction.transaction_hash) {
                 transactions_to_certify.push((block_range.clone(), transaction));

mithril-common/src/signable_builder/cardano_transactions.rs

@@ -73,9 +73,10 @@ impl CardanoTransactionsSignableBuilder {
         let mut transactions_by_block_ranges: HashMap<BlockRange, Vec<TransactionHash>> =
             HashMap::new();
         for transaction in transactions {
-            let block_range_start =
-                transaction.block_number / BLOCK_RANGE_LENGTH * BLOCK_RANGE_LENGTH;
-            let block_range_end = block_range_start + BLOCK_RANGE_LENGTH;
+            let block_range_end = transaction
+                .block_number
+                .next_multiple_of(BLOCK_RANGE_LENGTH);
+            let block_range_start = block_range_end - BLOCK_RANGE_LENGTH;
             let block_range = BlockRange::new(block_range_start, block_range_end);
             transactions_by_block_ranges
                 .entry(block_range)