Synchronise usage of test db connection between signer & aggregator

Author: Alenar

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

@@ -116,8 +116,6 @@ impl CertificateRetriever for CertificateRepository {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::{Connection, Value};
-
     use mithril_common::crypto_helper::tests_setup::setup_certificate_chain;
 
     use crate::database::test_helper::{insert_certificate_records, main_db_connection};

mithril-signer/src/cardano_transactions_importer.rs

@@ -1,14 +1,15 @@
-use async_trait::async_trait;
-use mithril_common::cardano_transaction_parser::TransactionParser;
-use mithril_common::entities::{CardanoTransaction, ImmutableFileNumber};
-use mithril_common::signable_builder::TransactionsImporter;
-use mithril_common::StdResult;
-use slog::{debug, Logger};
 use std::path::{Path, PathBuf};
 use std::sync::Arc;
 
+use async_trait::async_trait;
 #[cfg(test)]
 use mockall::automock;
+use slog::{debug, Logger};
+
+use mithril_common::cardano_transaction_parser::TransactionParser;
+use mithril_common::entities::{CardanoTransaction, ImmutableFileNumber};
+use mithril_common::signable_builder::TransactionsImporter;
+use mithril_common::StdResult;
 
 /// Cardano transactions store
 #[cfg_attr(test, automock)]
@@ -113,11 +114,12 @@ impl TransactionsImporter for CardanoTransactionsImporter {
 
 #[cfg(test)]
 mod tests {
-    use crate::database::repository::CardanoTransactionRepository;
-    use crate::database::test_utils::cardano_tx_connection;
     use mockall::mock;
     use mockall::predicate::eq;
 
+    use crate::database::repository::CardanoTransactionRepository;
+    use crate::database::test_utils::cardano_tx_db_connection;
+
     use super::*;
 
     mock! {
@@ -261,6 +263,7 @@ mod tests {
             CardanoTransaction::new("tx_hash-4", 20, 30, "block_hash-2", 12),
         ];
         let importer = {
+            let connection = cardano_tx_db_connection().unwrap();
             let parsed_transactions = transactions.clone();
             let mut parser = MockTransactionParserImpl::new();
             parser
@@ -269,9 +272,7 @@ mod tests {
 
             CardanoTransactionsImporter::new(
                 Arc::new(parser),
-                Arc::new(CardanoTransactionRepository::new(
-                    cardano_tx_connection().unwrap(),
-                )),
+                Arc::new(CardanoTransactionRepository::new(Arc::new(connection))),
                 Path::new(""),
                 None,
                 crate::test_tools::logger_for_tests(),

mithril-signer/src/database/mod.rs

@@ -10,18 +10,17 @@ pub mod repository;
 #[cfg(test)]
 pub mod test_utils {
     use sqlite::ConnectionThreadSafe;
-    use std::sync::Arc;
 
     use mithril_common::StdResult;
     use mithril_persistence::sqlite::{ConnectionBuilder, ConnectionOptions};
 
     use super::*;
 
-    pub fn cardano_tx_connection() -> StdResult<Arc<ConnectionThreadSafe>> {
+    pub fn cardano_tx_db_connection() -> StdResult<ConnectionThreadSafe> {
         let connection = ConnectionBuilder::open_memory()
             .with_options(&[ConnectionOptions::ForceDisableForeignKeys])
             .with_migrations(cardano_transaction_migration::get_migrations())
             .build()?;
-        Ok(Arc::new(connection))
+        Ok(connection)
     }
 }

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

@@ -149,13 +149,14 @@ impl TransactionStore for CardanoTransactionRepository {
 
 #[cfg(test)]
 mod tests {
-    use crate::database::test_utils::cardano_tx_connection;
+    use crate::database::test_utils::cardano_tx_db_connection;
 
     use super::*;
 
     #[tokio::test]
     async fn repository_create_and_get_transaction() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
         repository
             .create_transaction("tx-hash-123", 10, 50, "block_hash-123", 99)
             .await
@@ -180,7 +181,8 @@ mod tests {
 
     #[tokio::test]
     async fn repository_create_ignore_further_transactions_when_exists() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
         repository
             .create_transaction("tx-hash-123", 10, 50, "block_hash-123", 99)
             .await
@@ -205,7 +207,8 @@ mod tests {
 
     #[tokio::test]
     async fn repository_store_transactions_and_get_stored_transactions() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
 
         let cardano_transactions = vec![
             CardanoTransaction::new("tx-hash-123", 10, 50, "block-hash-123", 99),
@@ -245,7 +248,8 @@ mod tests {
 
     #[tokio::test]
     async fn repository_get_up_to_beacon_transactions() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
 
         let cardano_transactions: Vec<CardanoTransactionRecord> = (20..=40)
             .map(|i| CardanoTransactionRecord {
@@ -273,7 +277,8 @@ mod tests {
 
     #[tokio::test]
     async fn repository_get_all_stored_transactions() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
 
         let cardano_transactions = vec![
             CardanoTransaction::new("tx-hash-123".to_string(), 10, 50, "block-hash-123", 99),
@@ -295,7 +300,8 @@ mod tests {
 
     #[tokio::test]
     async fn repository_store_transactions_doesnt_erase_existing_data() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
 
         repository
             .create_transaction("tx-hash-000", 1, 5, "block-hash", 9)
@@ -330,15 +336,17 @@ mod tests {
 
     #[tokio::test]
     async fn repository_get_highest_beacon_without_transactions_in_db() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
 
         let highest_beacon = repository.get_highest_beacon().await.unwrap();
         assert_eq!(None, highest_beacon);
     }
 
     #[tokio::test]
     async fn repository_get_highest_beacon_with_transactions_in_db() {
-        let repository = CardanoTransactionRepository::new(cardano_tx_connection().unwrap());
+        let connection = Arc::new(cardano_tx_db_connection().unwrap());
+        let repository = CardanoTransactionRepository::new(connection);
 
         let cardano_transactions = vec![
             CardanoTransaction::new("tx-hash-123".to_string(), 10, 50, "block-hash-123", 50),