Rename certificatecolumn and record field to pending_certificate

Author: sfauvel

mithril-aggregator/src/database/migration.rs

@@ -864,12 +864,12 @@ insert into signed_entity_type (signed_entity_type_id, name)
             r#"
 create table new_pending_certificate (
     epoch                           integer     not null,
-    certificate                     text        not null,
+    pending_certificate             text        not null,
     created_at                      text        not null,
     primary key (epoch)
 );
 create table if not exists pending_certificate (key_hash text primary key, key json not null, value json not null);
-insert into new_pending_certificate (epoch, certificate, created_at) 
+insert into new_pending_certificate (epoch, pending_certificate, created_at) 
     select 
         json_extract(pending_certificate.value, '$.epoch') as epoch,
         pending_certificate.value, 

mithril-aggregator/src/database/query/pending_certificate/save_pending_certificate.rs

@@ -13,10 +13,10 @@ pub struct SavePendingCertificateRecordQuery {
 impl SavePendingCertificateRecordQuery {
     pub fn save(pending_certificate_record: CertificatePendingRecord) -> Self {
         let condition = WhereCondition::new(
-            "(epoch, certificate, created_at) values (?*, ?*, ?*)",
+            "(epoch, pending_certificate, created_at) values (?*, ?*, ?*)",
             vec![
                 Value::Integer(*pending_certificate_record.epoch as i64),
-                Value::String(pending_certificate_record.certificate),
+                Value::String(pending_certificate_record.pending_certificate),
                 Value::String(Utc::now().to_rfc3339()),
             ],
         );

mithril-aggregator/src/database/record/certificate_pending.rs

@@ -11,7 +11,7 @@ pub struct CertificatePendingRecord {
     pub epoch: Epoch,
 
     /// Pending certificate serialization as json
-    pub certificate: String,
+    pub pending_certificate: String,
 
     /// Date and time when the pending certificate was created
     pub created_at: DateTime<Utc>,
@@ -35,7 +35,7 @@ impl SqLiteEntity for CertificatePendingRecord {
         let created_at = &row.read::<&str, _>(2);
 
         let record = Self {
-            certificate: pending_certificate_json.to_string(),
+            pending_certificate: pending_certificate_json.to_string(),
             created_at: DateTime::parse_from_rfc3339(created_at)
                 .map_err(|e| {
                     HydrationError::InvalidData(format!(
@@ -57,7 +57,11 @@ impl SqLiteEntity for CertificatePendingRecord {
         let mut projection = Projection::default();
 
         projection.add_field("epoch", "{:pending_certificate:}.epoch", "integer");
-        projection.add_field("certificate", "{:pending_certificate:}.certificate", "text");
+        projection.add_field(
+            "pending_certificate",
+            "{:pending_certificate:}.pending_certificate",
+            "text",
+        );
         projection.add_field("created_at", "{:pending_certificate:}.created_at", "text");
 
         projection
@@ -70,7 +74,7 @@ impl TryFrom<CertificatePending> for CertificatePendingRecord {
     fn try_from(value: CertificatePending) -> Result<Self, Self::Error> {
         let record = Self {
             epoch: value.epoch,
-            certificate: serde_json::to_string(&value)?,
+            pending_certificate: serde_json::to_string(&value)?,
             created_at: Utc::now(),
         };
         Ok(record)
@@ -80,7 +84,7 @@ impl TryFrom<CertificatePending> for CertificatePendingRecord {
 impl TryFrom<CertificatePendingRecord> for CertificatePending {
     type Error = StdError;
     fn try_from(record: CertificatePendingRecord) -> Result<Self, Self::Error> {
-        let c: CertificatePending = serde_json::from_str(&record.certificate)?;
+        let c: CertificatePending = serde_json::from_str(&record.pending_certificate)?;
         let pending_certificate = Self {
             epoch: record.epoch,
             signed_entity_type: c.signed_entity_type,

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

@@ -35,10 +35,10 @@ impl CertificatePendingStorer for CertificatePendingRepository {
     }
 
     /// Save the given [CertificatePending].
-    async fn save(&self, certificate: CertificatePending) -> StdResult<()> {
+    async fn save(&self, pending_certificate: CertificatePending) -> StdResult<()> {
         self.connection
             .apply(SavePendingCertificateRecordQuery::save(
-                certificate.try_into()?,
+                pending_certificate.try_into()?,
             ))?;
 
         Ok(())