Remove now unused repository method fetching data using Immutables

Leaving only one required to compute the immutable block scanner lower
bound.

Author: Alenar

internal/mithril-persistence/src/database/repository/cardano_transaction_repository.rs

@@ -3,7 +3,6 @@ use std::sync::Arc;
 
 use anyhow::Context;
 use async_trait::async_trait;
-use sqlite::Value;
 
 use mithril_common::cardano_block_scanner::ImmutableLowerBoundFinder;
 use mithril_common::crypto_helper::MKTreeNode;
@@ -52,27 +51,6 @@ impl CardanoTransactionRepository {
             .fetch_collect(GetCardanoTransactionQuery::between_blocks(range))
     }
 
-    /// Return all the [CardanoTransactionRecord]s in the database up to the given beacon.
-    ///
-    /// Note: until we rely on block number based beacons, this function needs to compute the highest block number for the given immutable file number.
-    pub async fn get_transactions_up_to(
-        &self,
-        beacon: ImmutableFileNumber,
-    ) -> StdResult<Vec<CardanoTransactionRecord>> {
-        // Get the highest block number for the given immutable number.
-        // This is a temporary fix that will be removed when the retrieval is based on block number instead of immutable number.
-
-        if let Some(block_number) = self
-            .get_highest_block_number_for_immutable_number(beacon)
-            .await?
-        {
-            self.get_transactions_in_range_blocks(0..block_number + 1)
-                .await
-        } else {
-            Ok(vec![])
-        }
-    }
-
     /// Return the [CardanoTransactionRecord] for the given transaction hash.
     pub async fn get_transaction<T: Into<TransactionHash>>(
         &self,
@@ -128,24 +106,6 @@ impl CardanoTransactionRepository {
             .fetch_collect(InsertBlockRangeRootQuery::insert_many(records)?)
     }
 
-    // TODO: remove this function when the Cardano transaction signature is based on block number instead of immutable number
-    /// Get the highest [BlockNumber] of the cardano transactions stored in the database.
-    pub async fn get_highest_block_number_for_immutable_number(
-        &self,
-        immutable_file_number: ImmutableFileNumber,
-    ) -> StdResult<Option<BlockNumber>> {
-        let highest: Option<i64> = self.connection.query_single_cell(
-            "select max(block_number) as highest from cardano_tx where immutable_file_number <= ?;",
-            &[Value::Integer(immutable_file_number as i64)],
-        )?;
-        highest
-            .map(u64::try_from)
-            .transpose()
-            .with_context(||
-                format!("Integer field max(block_number) (value={highest:?}) is incompatible with u64 representation.")
-            )
-    }
-
     /// Get the highest [BlockNumber] of the cardano transactions stored in the database.
     pub async fn get_transaction_highest_block_number(&self) -> StdResult<Option<BlockNumber>> {
         let highest: Option<i64> = self
@@ -464,60 +424,6 @@ mod tests {
         );
     }
 
-    #[tokio::test]
-    async fn repository_get_up_to_beacon_transactions() {
-        let connection = Arc::new(cardano_tx_db_connection().unwrap());
-        let repository = CardanoTransactionRepository::new(connection);
-
-        let cardano_transactions: Vec<CardanoTransactionRecord> = CardanoTransactionsBuilder::new()
-            .max_transactions_per_immutable_file(10)
-            .first_immutable_file(120)
-            .build_transactions(40)
-            .into_iter()
-            .map(CardanoTransactionRecord::from)
-            .collect();
-
-        repository
-            .create_transactions(cardano_transactions.clone())
-            .await
-            .unwrap();
-
-        let transaction_result = repository.get_transactions_up_to(120).await.unwrap();
-        let transaction_up_to_immutable_file_number_12 = cardano_transactions[0..10].to_vec();
-        assert_eq!(
-            transaction_up_to_immutable_file_number_12,
-            transaction_result
-        );
-
-        let transaction_result = repository.get_transactions_up_to(300).await.unwrap();
-        let transaction_all = cardano_transactions[..].to_vec();
-        assert_eq!(transaction_all, transaction_result);
-
-        let transaction_result = repository.get_transactions_up_to(90).await.unwrap();
-        assert_eq!(Vec::<CardanoTransactionRecord>::new(), transaction_result);
-    }
-
-    #[tokio::test]
-    async fn get_transactions_up_to_return_empty_list_when_no_record_found_with_provided_immutable_file_number(
-    ) {
-        let connection = Arc::new(cardano_tx_db_connection().unwrap());
-        let repository = CardanoTransactionRepository::new(connection);
-
-        repository
-            .create_transactions(vec![CardanoTransaction::new(
-                "tx-hash-123".to_string(),
-                0,
-                50,
-                "block-hash-0",
-                99,
-            )])
-            .await
-            .unwrap();
-
-        let transaction_result = repository.get_transactions_up_to(90).await.unwrap();
-        assert_eq!(Vec::<CardanoTransactionRecord>::new(), transaction_result);
-    }
-
     #[tokio::test]
     async fn repository_get_all_stored_transactions() {
         let connection = Arc::new(cardano_tx_db_connection().unwrap());

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

@@ -3,9 +3,7 @@ use std::ops::Range;
 use async_trait::async_trait;
 
 use mithril_common::crypto_helper::MKTreeNode;
-use mithril_common::entities::{
-    BlockNumber, BlockRange, CardanoDbBeacon, CardanoTransaction, TransactionHash,
-};
+use mithril_common::entities::{BlockNumber, BlockRange, CardanoTransaction, TransactionHash};
 use mithril_common::StdResult;
 use mithril_persistence::database::repository::CardanoTransactionRepository;
 
@@ -51,16 +49,6 @@ impl TransactionStore for CardanoTransactionRepository {
 
 #[async_trait]
 impl TransactionsRetriever for CardanoTransactionRepository {
-    async fn get_up_to(&self, beacon: &CardanoDbBeacon) -> StdResult<Vec<CardanoTransaction>> {
-        self.get_transactions_up_to(beacon.immutable_file_number)
-            .await
-            .map(|v| {
-                v.into_iter()
-                    .map(|record| record.into())
-                    .collect::<Vec<CardanoTransaction>>()
-            })
-    }
-
     async fn get_by_hashes(
         &self,
         hashes: Vec<TransactionHash>,

mithril-aggregator/src/services/prover.rs

@@ -10,8 +10,7 @@ use std::{
 use mithril_common::{
     crypto_helper::{MKMap, MKMapNode, MKTree},
     entities::{
-        BlockRange, CardanoDbBeacon, CardanoTransaction, CardanoTransactionsSetProof, ChainPoint,
-        TransactionHash,
+        BlockRange, CardanoTransaction, CardanoTransactionsSetProof, ChainPoint, TransactionHash,
     },
     resource_pool::ResourcePool,
     signable_builder::BlockRangeRootRetriever,
@@ -37,9 +36,6 @@ pub trait ProverService: Sync + Send {
 #[cfg_attr(test, mockall::automock)]
 #[async_trait]
 pub trait TransactionsRetriever: Sync + Send {
-    /// Get all transactions up to given beacon using chronological order
-    async fn get_up_to(&self, beacon: &CardanoDbBeacon) -> StdResult<Vec<CardanoTransaction>>;
-
     /// Get a list of transactions by hashes using chronological order
     async fn get_by_hashes(
         &self,