Generalize usage of the common GetAllProvider

Author: Alenar

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

@@ -4,7 +4,7 @@ use sqlite::{ConnectionThreadSafe, Value};
 use mithril_common::entities::Epoch;
 use mithril_common::StdResult;
 use mithril_persistence::sqlite::{
-    EntityCursor, Provider, SourceAlias, SqLiteEntity, WhereCondition,
+    EntityCursor, GetAllCondition, Provider, SourceAlias, SqLiteEntity, WhereCondition,
 };
 
 use crate::database::record::CertificateRecord;
@@ -54,16 +54,10 @@ impl<'client> GetCertificateRecordProvider<'client> {
 
         Ok(certificate_record)
     }
-
-    /// Get all CertificateRecords.
-    pub fn get_all(&self) -> StdResult<EntityCursor<CertificateRecord>> {
-        let filters = WhereCondition::default();
-        let certificate_record = self.find(filters)?;
-
-        Ok(certificate_record)
-    }
 }
 
+impl GetAllCondition for GetCertificateRecordProvider<'_> {}
+
 impl<'client> Provider<'client> for GetCertificateRecordProvider<'client> {
     type Entity = CertificateRecord;
 
@@ -81,6 +75,7 @@ impl<'client> Provider<'client> for GetCertificateRecordProvider<'client> {
 #[cfg(test)]
 mod tests {
     use mithril_common::crypto_helper::tests_setup::setup_certificate_chain;
+    use mithril_persistence::sqlite::GetAllProvider;
 
     use crate::database::test_helper::{insert_certificate_records, main_db_connection};
 

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

@@ -97,17 +97,11 @@ impl<'client> GetSignedEntityRecordProvider<'client> {
 
         Ok(signed_entity_record)
     }
-
-    #[cfg(test)]
-    /// Get all SignedEntityRecords.
-    pub fn get_all(&self) -> StdResult<EntityCursor<SignedEntityRecord>> {
-        let filters = WhereCondition::default();
-        let signed_entity_record = self.find(filters)?;
-
-        Ok(signed_entity_record)
-    }
 }
 
+#[cfg(test)]
+impl mithril_persistence::sqlite::GetAllCondition for GetSignedEntityRecordProvider<'_> {}
+
 impl<'client> Provider<'client> for GetSignedEntityRecordProvider<'client> {
     type Entity = SignedEntityRecord;
 
@@ -127,6 +121,7 @@ impl<'client> Provider<'client> for GetSignedEntityRecordProvider<'client> {
 #[cfg(test)]
 mod tests {
     use mithril_common::entities::{CardanoDbBeacon, SignedEntityType};
+    use mithril_persistence::sqlite::GetAllProvider;
 
     use crate::database::test_helper::{insert_signed_entities, main_db_connection};
 

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

@@ -1,6 +1,5 @@
-use mithril_common::StdResult;
 use mithril_persistence::sqlite::{
-    EntityCursor, Provider, SourceAlias, SqLiteEntity, SqliteConnection, WhereCondition,
+    GetAllCondition, Provider, SourceAlias, SqLiteEntity, SqliteConnection,
 };
 
 use crate::database::record::SignerRecord;
@@ -15,33 +14,37 @@ impl<'client> GetSignerRecordProvider<'client> {
     pub fn new(client: &'client SqliteConnection) -> Self {
         Self { client }
     }
+}
 
-    #[cfg(test)]
-    fn condition_by_signer_id(&self, signer_id: String) -> StdResult<WhereCondition> {
-        Ok(WhereCondition::new(
-            "signer_id = ?*",
-            vec![sqlite::Value::String(signer_id)],
-        ))
-    }
-
-    #[cfg(test)]
-    /// Get SignerRecords for a given signer id.
-    pub fn get_by_signer_id(&self, signer_id: String) -> StdResult<EntityCursor<SignerRecord>> {
-        let filters = self.condition_by_signer_id(signer_id)?;
-        let signer_record = self.find(filters)?;
+#[cfg(test)]
+mod test_extensions {
+    use mithril_common::StdResult;
+    use mithril_persistence::sqlite::{EntityCursor, WhereCondition};
 
-        Ok(signer_record)
-    }
+    use crate::database::record::SignerRecord;
 
-    /// Get all SignerRecords.
-    pub fn get_all(&self) -> StdResult<EntityCursor<SignerRecord>> {
-        let filters = WhereCondition::default();
-        let signer_record = self.find(filters)?;
+    use super::*;
 
-        Ok(signer_record)
+    impl<'client> GetSignerRecordProvider<'client> {
+        fn condition_by_signer_id(&self, signer_id: String) -> StdResult<WhereCondition> {
+            Ok(WhereCondition::new(
+                "signer_id = ?*",
+                vec![sqlite::Value::String(signer_id)],
+            ))
+        }
+
+        /// Get SignerRecords for a given signer id.
+        pub fn get_by_signer_id(&self, signer_id: String) -> StdResult<EntityCursor<SignerRecord>> {
+            let filters = self.condition_by_signer_id(signer_id)?;
+            let signer_record = self.find(filters)?;
+
+            Ok(signer_record)
+        }
     }
 }
 
+impl GetAllCondition for GetSignerRecordProvider<'_> {}
+
 impl<'client> Provider<'client> for GetSignerRecordProvider<'client> {
     type Entity = SignerRecord;
 
@@ -58,6 +61,8 @@ impl<'client> Provider<'client> for GetSignerRecordProvider<'client> {
 
 #[cfg(test)]
 mod tests {
+    use mithril_persistence::sqlite::GetAllProvider;
+
     use crate::database::test_helper::{insert_signers, main_db_connection};
 
     use super::*;

mithril-aggregator/src/database/provider/signer_registration/get_signer_registration.rs

@@ -55,17 +55,11 @@ impl<'client> GetSignerRegistrationRecordProvider<'client> {
 
         Ok(signer_registration_record)
     }
-
-    #[cfg(test)]
-    /// Get all SignerRegistrationRecords.
-    pub fn get_all(&self) -> StdResult<EntityCursor<SignerRegistrationRecord>> {
-        let filters = WhereCondition::default();
-        let signer_registration_record = self.find(filters)?;
-
-        Ok(signer_registration_record)
-    }
 }
 
+#[cfg(test)]
+impl mithril_persistence::sqlite::GetAllCondition for GetSignerRegistrationRecordProvider<'_> {}
+
 impl<'client> Provider<'client> for GetSignerRegistrationRecordProvider<'client> {
     type Entity = SignerRegistrationRecord;
 
@@ -86,6 +80,7 @@ mod tests {
 
     use mithril_common::entities::SignerWithStake;
     use mithril_common::test_utils::MithrilFixtureBuilder;
+    use mithril_persistence::sqlite::GetAllProvider;
 
     use crate::database::test_helper::{insert_signer_registrations, main_db_connection};
 

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

@@ -7,7 +7,7 @@ use sqlite::ConnectionThreadSafe;
 use mithril_common::certificate_chain::{CertificateRetriever, CertificateRetrieverError};
 use mithril_common::entities::{Certificate, Epoch};
 use mithril_common::StdResult;
-use mithril_persistence::sqlite::Provider;
+use mithril_persistence::sqlite::{GetAllProvider, Provider};
 
 use crate::database::provider::{
     DeleteCertificateProvider, GetCertificateRecordProvider, InsertCertificateRecordProvider,

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

@@ -7,7 +7,7 @@ use chrono::Utc;
 use mockall::automock;
 
 use mithril_common::StdResult;
-use mithril_persistence::sqlite::SqliteConnection;
+use mithril_persistence::sqlite::{GetAllProvider, SqliteConnection};
 
 use crate::database::provider::{
     GetSignerRecordProvider, ImportSignerRecordProvider, RegisterSignerRecordProvider,