style: adjustments following pr reviews

Author: Alenar

mithril-signer/src/database/query/signed_beacon/get_signed_beacon.rs

@@ -34,13 +34,10 @@ impl GetSignedBeaconQuery {
         let condition = match signed_entity_types {
             [] => WhereCondition::new("false", vec![]),
             [first, rest @ ..] => {
-                let mut condition = signed_entity_condition(first)?;
-
-                for entity in rest {
-                    condition = condition.or_where(signed_entity_condition(entity)?);
-                }
-
-                condition
+                rest.iter()
+                    .try_fold(signed_entity_condition(first)?, |condition, entity| {
+                        StdResult::Ok(condition.or_where(signed_entity_condition(entity)?))
+                    })?
             }
         };
 
@@ -56,9 +53,9 @@ impl Query for GetSignedBeaconQuery {
     }
 
     fn get_definition(&self, condition: &str) -> String {
-        let aliases = SourceAlias::new(&[("{:signed_beacon:}", "b")]);
+        let aliases = SourceAlias::new(&[("{:signed_beacon:}", "signed_beacon")]);
         let projection = Self::Entity::get_projection().expand(aliases);
-        format!("select {projection} from signed_beacon as b where {condition} order by ROWID desc")
+        format!("select {projection} from signed_beacon where {condition} order by rowid desc")
     }
 }
 

mithril-signer/src/database/record/signed_beacon_record.rs

@@ -86,13 +86,13 @@ impl SqLiteEntity for SignedBeaconRecord {
         let beacon_str = Hydrator::read_signed_entity_beacon_column(&row, 1);
         let signed_entity_type_id = usize::try_from(row.read::<i64, _>(2)).map_err(|e| {
             panic!(
-                "Integer field open_message.signed_entity_type_id cannot be turned into usize: {e}"
+                "Integer field signed_beacon.signed_entity_type_id cannot be turned into usize: {e}"
             )
         })?;
         let initiated_at = &row.read::<&str, _>(3);
         let signed_at = &row.read::<&str, _>(4);
 
-        let open_message = Self {
+        let signed_beacon = Self {
             epoch: Epoch(epoch.try_into().map_err(|e| {
                 HydrationError::InvalidData(format!(
                     "Could not cast i64 ({epoch}) to u64. Error: '{e}'"
@@ -111,7 +111,7 @@ impl SqLiteEntity for SignedBeaconRecord {
             })?.with_timezone(&Utc),
         };
 
-        Ok(open_message)
+        Ok(signed_beacon)
     }
 
     fn get_projection() -> Projection {

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

@@ -56,12 +56,7 @@ impl SignedBeaconStore for SignedBeaconRepository {
     }
 
     async fn mark_beacon_as_signed(&self, entity: &BeaconToSign) -> StdResult<()> {
-        let record = SignedBeaconRecord {
-            epoch: entity.epoch,
-            signed_entity_type: entity.signed_entity_type.clone(),
-            initiated_at: entity.initiated_at,
-            signed_at: chrono::Utc::now(),
-        };
+        let record = entity.clone().into();
         let _ = self
             .connection
             .fetch_first(InsertSignedBeaconRecordQuery::one(record)?)?;