Simplify sqlite connections building in tests

Author: Alenar

mithril-aggregator/src/database/provider/certificate/get_certificate.rs

@@ -80,33 +80,18 @@ impl<'client> Provider<'client> for GetCertificateRecordProvider<'client> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
-
     use mithril_common::crypto_helper::tests_setup::setup_certificate_chain;
-    use mithril_common::entities::Certificate;
 
-    use crate::database::test_helper::{
-        apply_all_migrations_to_db, disable_foreign_key_support, insert_certificate_records,
-    };
+    use crate::database::test_helper::{insert_certificate_records, main_db_connection};
 
     use super::*;
 
-    pub fn setup_certificate_db(
-        connection: &ConnectionThreadSafe,
-        certificates: Vec<Certificate>,
-    ) -> StdResult<()> {
-        apply_all_migrations_to_db(connection)?;
-        disable_foreign_key_support(connection)?;
-        insert_certificate_records(connection, certificates);
-        Ok(())
-    }
-
     #[test]
     fn test_get_certificate_records() {
         let (certificates, _) = setup_certificate_chain(20, 7);
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        setup_certificate_db(&connection, certificates.clone()).unwrap();
+        let connection = main_db_connection().unwrap();
+        insert_certificate_records(&connection, certificates.clone());
 
         let provider = GetCertificateRecordProvider::new(&connection);
 

mithril-aggregator/src/database/provider/certificate/insert_certificate.rs

@@ -134,34 +134,17 @@ impl<'conn> Provider<'conn> for InsertCertificateRecordProvider<'conn> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
-
     use mithril_common::crypto_helper::tests_setup::setup_certificate_chain;
-    use mithril_common::entities::Certificate;
 
-    use crate::database::test_helper::{
-        apply_all_migrations_to_db, disable_foreign_key_support, insert_certificate_records,
-    };
+    use crate::database::test_helper::main_db_connection;
 
     use super::*;
 
-    pub fn setup_certificate_db(
-        connection: &ConnectionThreadSafe,
-        certificates: Vec<Certificate>,
-    ) -> StdResult<()> {
-        apply_all_migrations_to_db(connection)?;
-        disable_foreign_key_support(connection)?;
-        insert_certificate_records(connection, certificates);
-        Ok(())
-    }
-
     #[test]
     fn test_insert_certificate_record() {
         let (certificates, _) = setup_certificate_chain(5, 2);
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        setup_certificate_db(&connection, Vec::new()).unwrap();
-
+        let connection = main_db_connection().unwrap();
         let provider = InsertCertificateRecordProvider::new(&connection);
 
         for certificate in certificates {
@@ -177,10 +160,9 @@ mod tests {
         let certificates_records: Vec<CertificateRecord> =
             certificates.into_iter().map(|cert| cert.into()).collect();
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        setup_certificate_db(&connection, Vec::new()).unwrap();
-
+        let connection = main_db_connection().unwrap();
         let provider = InsertCertificateRecordProvider::new(&connection);
+
         let certificates_records_saved = provider
             .persist_many(certificates_records.clone())
             .expect("saving many records should not fail");

mithril-aggregator/src/database/provider/epoch_setting/delete_epoch_setting.rs

@@ -69,17 +69,14 @@ impl<'conn> DeleteEpochSettingProvider<'conn> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
-
     use crate::database::provider::GetEpochSettingProvider;
-    use crate::database::test_helper::{apply_all_migrations_to_db, insert_epoch_settings};
+    use crate::database::test_helper::{insert_epoch_settings, main_db_connection};
 
     use super::*;
 
     #[test]
     fn test_delete() {
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
+        let connection = main_db_connection().unwrap();
         insert_epoch_settings(&connection, &[1, 2]).unwrap();
 
         let provider = DeleteEpochSettingProvider::new(&connection);
@@ -99,8 +96,7 @@ mod tests {
 
     #[test]
     fn test_prune() {
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
+        let connection = main_db_connection().unwrap();
         insert_epoch_settings(&connection, &[1, 2]).unwrap();
 
         let provider = DeleteEpochSettingProvider::new(&connection);

mithril-aggregator/src/database/provider/epoch_setting/get_epoch_setting.rs

@@ -55,27 +55,16 @@ impl<'client> Provider<'client> for GetEpochSettingProvider<'client> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
-
     use mithril_common::entities::ProtocolParameters;
 
-    use crate::database::test_helper::{apply_all_migrations_to_db, insert_epoch_settings};
+    use crate::database::test_helper::{insert_epoch_settings, main_db_connection};
 
     use super::*;
 
-    pub fn setup_epoch_setting_db(
-        connection: &SqliteConnection,
-        epoch_to_insert_settings: &[u64],
-    ) -> StdResult<()> {
-        apply_all_migrations_to_db(connection)?;
-        insert_epoch_settings(connection, epoch_to_insert_settings)?;
-        Ok(())
-    }
-
     #[test]
     fn test_get_epoch_settings() {
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        setup_epoch_setting_db(&connection, &[1, 2, 3]).unwrap();
+        let connection = main_db_connection().unwrap();
+        insert_epoch_settings(&connection, &[1, 2, 3]).unwrap();
 
         let provider = GetEpochSettingProvider::new(&connection);
 

mithril-aggregator/src/database/provider/epoch_setting/update_epoch_setting.rs

@@ -71,19 +71,16 @@ impl<'conn> Provider<'conn> for UpdateEpochSettingProvider<'conn> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
-
     use mithril_common::test_utils::fake_data;
 
     use crate::database::provider::GetEpochSettingProvider;
-    use crate::database::test_helper::{apply_all_migrations_to_db, insert_epoch_settings};
+    use crate::database::test_helper::{insert_epoch_settings, main_db_connection};
 
     use super::*;
 
     #[test]
     fn test_update_epoch_setting() {
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
+        let connection = main_db_connection().unwrap();
         insert_epoch_settings(&connection, &[3]).unwrap();
 
         let provider = UpdateEpochSettingProvider::new(&connection);

mithril-aggregator/src/database/provider/signed_entity/get_signed_entity.rs

@@ -126,34 +126,18 @@ impl<'client> Provider<'client> for GetSignedEntityRecordProvider<'client> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
+    use mithril_common::entities::{CardanoDbBeacon, SignedEntityType};
 
-    use mithril_common::entities::CardanoDbBeacon;
-    use mithril_common::entities::SignedEntityType;
-
-    use crate::database::test_helper::{
-        apply_all_migrations_to_db, disable_foreign_key_support, insert_signed_entities,
-    };
+    use crate::database::test_helper::{insert_signed_entities, main_db_connection};
 
     use super::*;
 
-    pub fn setup_signed_entity_db(
-        connection: &SqliteConnection,
-        signed_entity_records: Vec<SignedEntityRecord>,
-    ) -> StdResult<()> {
-        apply_all_migrations_to_db(connection)?;
-        disable_foreign_key_support(connection)?;
-        insert_signed_entities(connection, signed_entity_records)?;
-
-        Ok(())
-    }
-
     #[test]
     fn test_get_signed_entity_records() {
         let signed_entity_records = SignedEntityRecord::fake_records(5);
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        setup_signed_entity_db(&connection, signed_entity_records.clone()).unwrap();
+        let connection = main_db_connection().unwrap();
+        insert_signed_entities(&connection, signed_entity_records.clone()).unwrap();
 
         let provider = GetSignedEntityRecordProvider::new(&connection);
 

mithril-aggregator/src/database/provider/signed_entity/insert_signed_entity.rs

@@ -70,20 +70,15 @@ impl<'conn> Provider<'conn> for InsertSignedEntityRecordProvider<'conn> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
-
-    use crate::database::test_helper::{apply_all_migrations_to_db, disable_foreign_key_support};
+    use crate::database::test_helper::main_db_connection;
 
     use super::*;
 
     #[test]
     fn test_insert_signed_entity_record() {
         let signed_entity_records = SignedEntityRecord::fake_records(5);
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
-        disable_foreign_key_support(&connection).unwrap();
-
+        let connection = main_db_connection().unwrap();
         let provider = InsertSignedEntityRecordProvider::new(&connection);
 
         for signed_entity_record in signed_entity_records {

mithril-aggregator/src/database/provider/signer/get_signer.rs

@@ -61,18 +61,15 @@ impl<'client> Provider<'client> for GetSignerRecordProvider<'client> {
 
 #[cfg(test)]
 mod tests {
-    use sqlite::Connection;
-
-    use crate::database::test_helper::{apply_all_migrations_to_db, insert_signers};
+    use crate::database::test_helper::{insert_signers, main_db_connection};
 
     use super::*;
 
     #[test]
     fn test_get_signer_records() {
         let signer_records_fake = SignerRecord::fake_records(5);
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
+        let connection = main_db_connection().unwrap();
         insert_signers(&connection, signer_records_fake.clone()).unwrap();
 
         let provider = GetSignerRecordProvider::new(&connection);

mithril-aggregator/src/database/provider/signer/import_signer.rs

@@ -96,18 +96,16 @@ impl<'conn> Provider<'conn> for ImportSignerRecordProvider<'conn> {
 #[cfg(test)]
 mod tests {
     use chrono::Duration;
-    use sqlite::Connection;
 
-    use crate::database::test_helper::{apply_all_migrations_to_db, insert_signers};
+    use crate::database::test_helper::{insert_signers, main_db_connection};
 
     use super::*;
 
     #[test]
     fn test_update_signer_record() {
         let signer_records_fake = SignerRecord::fake_records(5);
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
+        let connection = main_db_connection().unwrap();
         insert_signers(&connection, signer_records_fake.clone()).unwrap();
 
         let provider = ImportSignerRecordProvider::new(&connection);
@@ -130,8 +128,7 @@ mod tests {
         let mut signer_records_fake = SignerRecord::fake_records(5);
         signer_records_fake.sort_by(|a, b| a.signer_id.cmp(&b.signer_id));
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
+        let connection = main_db_connection().unwrap();
         insert_signers(&connection, signer_records_fake.clone()).unwrap();
 
         let provider = ImportSignerRecordProvider::new(&connection);

mithril-aggregator/src/database/provider/signer/register_signer.rs

@@ -73,19 +73,16 @@ impl<'conn> Provider<'conn> for RegisterSignerRecordProvider<'conn> {
 #[cfg(test)]
 mod tests {
     use chrono::Duration;
-    use sqlite::Connection;
 
-    use crate::database::test_helper::apply_all_migrations_to_db;
+    use crate::database::test_helper::main_db_connection;
 
     use super::*;
 
     #[test]
     fn test_insert_signer_record() {
         let signer_records_fake = SignerRecord::fake_records(5);
 
-        let connection = Connection::open_thread_safe(":memory:").unwrap();
-        apply_all_migrations_to_db(&connection).unwrap();
-
+        let connection = main_db_connection().unwrap();
         let provider = RegisterSignerRecordProvider::new(&connection);
 
         for signer_record in signer_records_fake.clone() {